From: Greg Kroah-Hartman Date: Tue, 21 Mar 2023 17:29:38 +0000 (+0100) Subject: 6.2-stable patches X-Git-Tag: v4.14.311~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff07053ceae3f68e0b87f53551fe681acb0eadfb;p=thirdparty%2Fkernel%2Fstable-queue.git 6.2-stable patches added patches: powerpc-64-replace-mcpu-e500mc64-by-mcpu-e5500.patch powerpc-disable-cpu-unknown-by-clang-when-cc_is_clang.patch --- diff --git a/queue-6.2/powerpc-64-replace-mcpu-e500mc64-by-mcpu-e5500.patch b/queue-6.2/powerpc-64-replace-mcpu-e500mc64-by-mcpu-e5500.patch new file mode 100644 index 00000000000..a712a67e081 --- /dev/null +++ b/queue-6.2/powerpc-64-replace-mcpu-e500mc64-by-mcpu-e5500.patch @@ -0,0 +1,38 @@ +From 77e82fa1f9781a958a6ea4aed7aec41239a5a22f Mon Sep 17 00:00:00 2001 +From: Christophe Leroy +Date: Mon, 19 Dec 2022 19:45:58 +0100 +Subject: powerpc/64: Replace -mcpu=e500mc64 by -mcpu=e5500 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Christophe Leroy + +commit 77e82fa1f9781a958a6ea4aed7aec41239a5a22f upstream. + +E500MC64 is a processor pre-dating E5500 that has never been +commercialised. Use -mcpu=e5500 for E5500 core. + +More details at https://gcc.gnu.org/PR108149 + +Signed-off-by: Christophe Leroy +Acked-by: Pali Rohár +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/fa71ed20d22c156225436374f0ab847daac893bc.1671475543.git.christophe.leroy@csgroup.eu +Cc: Naresh Kamboju +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/platforms/Kconfig.cputype | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/powerpc/platforms/Kconfig.cputype ++++ b/arch/powerpc/platforms/Kconfig.cputype +@@ -257,7 +257,7 @@ config TARGET_CPU + default "power8" if POWER8_CPU + default "power9" if POWER9_CPU + default "power10" if POWER10_CPU +- default "e500mc64" if E5500_CPU ++ default "e5500" if E5500_CPU + default "e6500" if E6500_CPU + default "power4" if POWERPC64_CPU && !CPU_LITTLE_ENDIAN + default "power8" if POWERPC64_CPU && CPU_LITTLE_ENDIAN diff --git a/queue-6.2/powerpc-disable-cpu-unknown-by-clang-when-cc_is_clang.patch b/queue-6.2/powerpc-disable-cpu-unknown-by-clang-when-cc_is_clang.patch new file mode 100644 index 00000000000..ea4fc8089fe --- /dev/null +++ b/queue-6.2/powerpc-disable-cpu-unknown-by-clang-when-cc_is_clang.patch @@ -0,0 +1,82 @@ +From 4b10306e98456aed03cad75ce467e8b1efdccca0 Mon Sep 17 00:00:00 2001 +From: Christophe Leroy +Date: Thu, 2 Feb 2023 12:01:04 +0100 +Subject: powerpc: Disable CPU unknown by CLANG when CC_IS_CLANG + +From: Christophe Leroy + +commit 4b10306e98456aed03cad75ce467e8b1efdccca0 upstream. + +CLANG only knows the following CPUs: + +generic, 440, 450, 601, 602, 603, 603e, 603ev, 604, 604e, 620, 630, +g3, 7400, g4, 7450, g4+, 750, 8548, 970, g5, a2, e500, e500mc, e5500, +power3, pwr3, power4, pwr4, power5, pwr5, power5x, pwr5x, power6, +pwr6, power6x, pwr6x, power7, pwr7, power8, pwr8, power9, pwr9, +power10, pwr10, powerpc, ppc, ppc32, powerpc64, ppc64, powerpc64le, +ppc64le, futur + +Disable other ones when CC_IS_CLANG. + +Signed-off-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/e62892e32c14a7a5738c597e39e0082cb0abf21c.1675335659.git.christophe.leroy@csgroup.eu +Cc: Nick Desaulniers +Cc: Naresh Kamboju +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/platforms/Kconfig.cputype | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/arch/powerpc/platforms/Kconfig.cputype ++++ b/arch/powerpc/platforms/Kconfig.cputype +@@ -143,6 +143,7 @@ config POWERPC_CPU + config CELL_CPU + bool "Cell Broadband Engine" + depends on PPC_BOOK3S_64 && !CPU_LITTLE_ENDIAN ++ depends on !CC_IS_CLANG + select PPC_64S_HASH_MMU + + config PPC_970_CPU +@@ -187,11 +188,13 @@ config E5500_CPU + config E6500_CPU + bool "Freescale e6500" + depends on PPC64 && PPC_E500 ++ depends on !CC_IS_CLANG + select PPC_HAS_LBARX_LHARX + + config 405_CPU + bool "40x family" + depends on 40x ++ depends on !CC_IS_CLANG + + config 440_CPU + bool "440 (44x family)" +@@ -200,22 +203,27 @@ config 440_CPU + config 464_CPU + bool "464 (44x family)" + depends on 44x ++ depends on !CC_IS_CLANG + + config 476_CPU + bool "476 (47x family)" + depends on PPC_47x ++ depends on !CC_IS_CLANG + + config 860_CPU + bool "8xx family" + depends on PPC_8xx ++ depends on !CC_IS_CLANG + + config E300C2_CPU + bool "e300c2 (832x)" + depends on PPC_BOOK3S_32 ++ depends on !CC_IS_CLANG + + config E300C3_CPU + bool "e300c3 (831x)" + depends on PPC_BOOK3S_32 ++ depends on !CC_IS_CLANG + + config G4_CPU + bool "G4 (74xx)" diff --git a/queue-6.2/series b/queue-6.2/series index 2ff469650de..707cb9702bb 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -210,3 +210,5 @@ virt-coco-sev-guest-do-some-code-style-cleanups.patch virt-coco-sev-guest-convert-the-sw_exit_info_2-checking-to-a-switch-case.patch virt-coco-sev-guest-add-throttling-awareness.patch perf-fix-check-before-add_event_to_groups-in-perf_group_detach.patch +powerpc-disable-cpu-unknown-by-clang-when-cc_is_clang.patch +powerpc-64-replace-mcpu-e500mc64-by-mcpu-e5500.patch