From 9b7701e4ab47074b4ca17cb1ca50edded8c5238c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 16 Mar 2023 09:04:51 +0100 Subject: [PATCH] drop powerpc patch that broke the build on 6.2.y and 6.1.y --- ...-t-always-pass-mcpu-powerpc-when-bui.patch | 68 ------------------- queue-6.1/series | 1 - ...-t-always-pass-mcpu-powerpc-when-bui.patch | 68 ------------------- queue-6.2/series | 1 - 4 files changed, 138 deletions(-) delete mode 100644 queue-6.1/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-bui.patch delete mode 100644 queue-6.2/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-bui.patch diff --git a/queue-6.1/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-bui.patch b/queue-6.1/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-bui.patch deleted file mode 100644 index f9a59bce7e0..00000000000 --- a/queue-6.1/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-bui.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 16653e56716d799166f4e6d8bb2be304ef74ed18 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 25 Jan 2023 08:39:00 +0100 -Subject: 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 - -From: Pali Rohár - -[ Upstream commit ff7c76f66d8bad4e694c264c789249e1d3a8205d ] - -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@vger.kernel.org # v5.19+ -Signed-off-by: Pali Rohár -Signed-off-by: Christophe Leroy -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/2ae3ae5887babfdacc34435bff0944b3f336100a.1674632329.git.christophe.leroy@csgroup.eu -Signed-off-by: Sasha Levin ---- - arch/powerpc/boot/Makefile | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile -index d32d95aea5d6f..295f76df13b55 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) --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index bfb4076d8c7..799468e4de6 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -40,7 +40,6 @@ fs-dlm-fix-race-setting-stop-tx-flag.patch udf-fix-off-by-one-error-when-discarding-preallocati.patch bus-mhi-ep-power-up-down-mhi-stack-during-mhi-reset.patch bus-mhi-ep-change-state_lock-to-mutex.patch -powerpc-boot-don-t-always-pass-mcpu-powerpc-when-bui.patch input-exc3000-properly-stop-timer-on-shutdown.patch ipmi-ssif-remove-rtc_us_timer.patch ipmi-ssif-increase-the-message-retry-time.patch diff --git a/queue-6.2/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-bui.patch b/queue-6.2/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-bui.patch deleted file mode 100644 index c1220ba0cc4..00000000000 --- a/queue-6.2/powerpc-boot-don-t-always-pass-mcpu-powerpc-when-bui.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 71b995a2e2ad1c1b377d9daf48b5f4b7428e62c1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 25 Jan 2023 08:39:00 +0100 -Subject: 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 - -From: Pali Rohár - -[ Upstream commit ff7c76f66d8bad4e694c264c789249e1d3a8205d ] - -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@vger.kernel.org # v5.19+ -Signed-off-by: Pali Rohár -Signed-off-by: Christophe Leroy -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/2ae3ae5887babfdacc34435bff0944b3f336100a.1674632329.git.christophe.leroy@csgroup.eu -Signed-off-by: Sasha Levin ---- - arch/powerpc/boot/Makefile | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile -index d32d95aea5d6f..295f76df13b55 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) --- -2.39.2 - diff --git a/queue-6.2/series b/queue-6.2/series index 4d733c9d71d..fbb290cd4a6 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -33,7 +33,6 @@ kvm-vmx-do-_all_-initialization-before-exposing-dev-.patch udf-fix-off-by-one-error-when-discarding-preallocati.patch bus-mhi-ep-power-up-down-mhi-stack-during-mhi-reset.patch bus-mhi-ep-change-state_lock-to-mutex.patch -powerpc-boot-don-t-always-pass-mcpu-powerpc-when-bui.patch drm-i915-introduce-intel_panel_init_alloc.patch drm-i915-do-panel-vbt-init-early-if-the-vbt-declares.patch drm-i915-populate-encoder-devdata-for-dsi-on-icl.patch -- 2.47.3