]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
powerpc/boot: Fix boot wrapper code generation with CONFIG_POWER10_CPU
authorNicholas Piggin <npiggin@gmail.com>
Fri, 7 Apr 2023 04:09:09 +0000 (14:09 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:10:48 +0000 (23:10 +0900)
commit 648a1783fe2551f5a091c9a5f8f463cb2cbf8745 upstream.

-mcpu=power10 will generate prefixed and pcrel code by default, which
we do not support. The general kernel disables these with cflags, but
those were missed for the boot wrapper.

Fixes: 4b2a9315f20d ("powerpc/64s: POWER10 CPU Kconfig build option")
Cc: stable@vger.kernel.org # v6.1+
Reported-by: Danny Tsen <dtsen@linux.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230407040909.230998-1-npiggin@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/boot/Makefile

index 295f76df13b5583f4c05aca54a644b23cc8dc1df..13fad4f0a6d8fbc933c9abc8496eec3eb5bdf357 100644 (file)
@@ -34,6 +34,8 @@ endif
 
 BOOTCFLAGS    := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                 -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \
+                $(call cc-option,-mno-prefixed) $(call cc-option,-mno-pcrel) \
+                $(call cc-option,-mno-mma) \
                 $(call cc-option,-mno-spe) $(call cc-option,-mspe=no) \
                 -pipe -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \
                 $(LINUXINCLUDE)