Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/4xx: Fix build errors from mfdcr()

lkp reported a build error in fsp2.o:

CC arch/powerpc/platforms/44x/fsp2.o
{standard input}:577: Error: unsupported relocation against base

Which comes from:

pr_err("GESR0: 0x%08x\n", mfdcr(base + PLB4OPB_GESR0));

Where our mfdcr() macro is stringifying "base + PLB4OPB_GESR0", and
passing that to the assembler, which obviously doesn't work.

The mfdcr() macro already checks that the argument is constant using
__builtin_constant_p(), and if not calls the out-of-line version of
mfdcr(). But in this case GCC is smart enough to notice that "base +
PLB4OPB_GESR0" will be constant, even though it's not something we can
immediately stringify into a register number.

Segher pointed out that passing the register number to the inline asm
as a constant would be better, and in fact it fixes the build error,
presumably because it gives GCC a chance to resolve the value.

While we're at it, change mtdcr() similarly.

Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Feng Tang <feng.tang@intel.com>
Link: https://lore.kernel.org/r/20210218123058.748882-1-mpe@ellerman.id.au

+4 -4
+4 -4
arch/powerpc/include/asm/dcr-native.h
··· 53 53 #define mfdcr(rn) \ 54 54 ({unsigned int rval; \ 55 55 if (__builtin_constant_p(rn) && rn < 1024) \ 56 - asm volatile("mfdcr %0," __stringify(rn) \ 57 - : "=r" (rval)); \ 56 + asm volatile("mfdcr %0, %1" : "=r" (rval) \ 57 + : "n" (rn)); \ 58 58 else if (likely(cpu_has_feature(CPU_FTR_INDEXED_DCR))) \ 59 59 rval = mfdcrx(rn); \ 60 60 else \ ··· 64 64 #define mtdcr(rn, v) \ 65 65 do { \ 66 66 if (__builtin_constant_p(rn) && rn < 1024) \ 67 - asm volatile("mtdcr " __stringify(rn) ",%0" \ 68 - : : "r" (v)); \ 67 + asm volatile("mtdcr %0, %1" \ 68 + : : "n" (rn), "r" (v)); \ 69 69 else if (likely(cpu_has_feature(CPU_FTR_INDEXED_DCR))) \ 70 70 mtdcrx(rn, v); \ 71 71 else \