On Thursday 16 March 2023 09:01:31 gregkh@xxxxxxxxxxxxxxxxxxx wrote: > The patch below does not apply to the 6.1-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <stable@xxxxxxxxxxxxxxx>. > > To reproduce the conflict and resubmit, you may use the following commands: > > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y > git checkout FETCH_HEAD > git cherry-pick -x ff7c76f66d8bad4e694c264c789249e1d3a8205d It applies cleanly for me with above steps. > # <resolve conflicts, build, test, etc.> > git commit -s > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '1678953691202116@xxxxxxxxx' --subject-prefix 'PATCH 6.1.y' HEAD^.. > > Possible dependencies: > > ff7c76f66d8b ("powerpc/boot: Don't always pass -mcpu=powerpc when building 32-bit uImage") Probably you are missing fix for CONFIG_TARGET_CPU_BOOL as mentioned previously. Commit is: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=45f7091aac3546ef8112bf62836650ca0bbf0b79 > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From ff7c76f66d8bad4e694c264c789249e1d3a8205d Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@xxxxxxxxxx> > Date: Wed, 25 Jan 2023 08:39:00 +0100 > Subject: [PATCH] powerpc/boot: Don't always pass -mcpu=powerpc when building > 32-bit uImage > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > When CONFIG_TARGET_CPU is specified then pass its value to the compiler > -mcpu option. This fixes following build error when building kernel with > powerpc e500 SPE capable cross compilers: > > BOOTAS arch/powerpc/boot/crt0.o > powerpc-linux-gnuspe-gcc: error: unrecognized argument in option ‘-mcpu=powerpc’ > powerpc-linux-gnuspe-gcc: note: valid arguments to ‘-mcpu=’ are: 8540 8548 native > make[1]: *** [arch/powerpc/boot/Makefile:231: arch/powerpc/boot/crt0.o] Error 1 > > Similar change was already introduced for the main powerpc Makefile in > commit 446cda1b21d9 ("powerpc/32: Don't always pass -mcpu=powerpc to the > compiler"). > > Fixes: 40a75584e526 ("powerpc/boot: Build wrapper for an appropriate CPU") > Cc: stable@xxxxxxxxxxxxxxx # v5.19+ > Signed-off-by: Pali Rohár <pali@xxxxxxxxxx> > Signed-off-by: Christophe Leroy <christophe.leroy@xxxxxxxxxx> > Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> > Link: https://lore.kernel.org/r/2ae3ae5887babfdacc34435bff0944b3f336100a.1674632329.git.christophe.leroy@xxxxxxxxxx > > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index d32d95aea5d6..295f76df13b5 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -39,13 +39,19 @@ BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ > $(LINUXINCLUDE) > > ifdef CONFIG_PPC64_BOOT_WRAPPER > -ifdef CONFIG_CPU_LITTLE_ENDIAN > -BOOTCFLAGS += -m64 -mcpu=powerpc64le > +BOOTCFLAGS += -m64 > else > -BOOTCFLAGS += -m64 -mcpu=powerpc64 > +BOOTCFLAGS += -m32 > endif > + > +ifdef CONFIG_TARGET_CPU_BOOL > +BOOTCFLAGS += -mcpu=$(CONFIG_TARGET_CPU) > +else ifdef CONFIG_PPC64_BOOT_WRAPPER > +ifdef CONFIG_CPU_LITTLE_ENDIAN > +BOOTCFLAGS += -mcpu=powerpc64le > else > -BOOTCFLAGS += -m32 -mcpu=powerpc > +BOOTCFLAGS += -mcpu=powerpc64 > +endif > endif > > BOOTCFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) >
