This is a note to let you know that I've just added the patch titled
powerpc/boot: Fix boot wrapper code generation with CONFIG_POWER10_CPU
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
powerpc-boot-fix-boot-wrapper-code-generation-with-config_power10_cpu.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 648a1783fe2551f5a091c9a5f8f463cb2cbf8745 Mon Sep 17 00:00:00 2001
From: Nicholas Piggin <npiggin@xxxxxxxxx>
Date: Fri, 7 Apr 2023 14:09:09 +1000
Subject: powerpc/boot: Fix boot wrapper code generation with CONFIG_POWER10_CPU
From: Nicholas Piggin <npiggin@xxxxxxxxx>
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@xxxxxxxxxxxxxxx # v6.1+
Reported-by: Danny Tsen <dtsen@xxxxxxxxxxxxx>
Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Link: https://msgid.link/20230407040909.230998-1-npiggin@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/boot/Makefile | 2 ++
1 file changed, 2 insertions(+)
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -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)
Patches currently in stable-queue which might be from npiggin@xxxxxxxxx are
queue-6.1/powerpc-boot-fix-boot-wrapper-code-generation-with-config_power10_cpu.patch
