From: Greg Kroah-Hartman Date: Mon, 24 Jan 2022 11:36:40 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.4.300~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af07ea88490b07a0c0f002f1f127ef05c90cf1cb;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: powerpc-cell-fix-clang-wimplicit-fallthrough-warning.patch powerpc-fsl-dts-enable-wa-for-erratum-a-009885-on-fman3l-mdio-buses.patch --- diff --git a/queue-4.14/powerpc-cell-fix-clang-wimplicit-fallthrough-warning.patch b/queue-4.14/powerpc-cell-fix-clang-wimplicit-fallthrough-warning.patch new file mode 100644 index 00000000000..f3fa0e9127d --- /dev/null +++ b/queue-4.14/powerpc-cell-fix-clang-wimplicit-fallthrough-warning.patch @@ -0,0 +1,47 @@ +From e89257e28e844f5d1d39081bb901d9f1183a7705 Mon Sep 17 00:00:00 2001 +From: Anders Roxell +Date: Tue, 7 Dec 2021 12:02:28 +0100 +Subject: powerpc/cell: Fix clang -Wimplicit-fallthrough warning + +From: Anders Roxell + +commit e89257e28e844f5d1d39081bb901d9f1183a7705 upstream. + +Clang warns: + +arch/powerpc/platforms/cell/pervasive.c:81:2: error: unannotated fall-through between switch labels + case SRR1_WAKEEE: + ^ +arch/powerpc/platforms/cell/pervasive.c:81:2: note: insert 'break;' to avoid fall-through + case SRR1_WAKEEE: + ^ + break; +1 error generated. + +Clang is more pedantic than GCC, which does not warn when failing +through to a case that is just break or return. Clang's version is more +in line with the kernel's own stance in deprecated.rst. Add athe missing +break to silence the warning. + +Fixes: 6e83985b0f6e ("powerpc/cbe: Do not process external or decremeter interrupts from sreset") +Reported-by: Naresh Kamboju +Signed-off-by: Anders Roxell +Reviewed-by: Nathan Chancellor +Reviewed-by: Arnd Bergmann +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20211207110228.698956-1-anders.roxell@linaro.org +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/platforms/cell/pervasive.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/powerpc/platforms/cell/pervasive.c ++++ b/arch/powerpc/platforms/cell/pervasive.c +@@ -90,6 +90,7 @@ static int cbe_system_reset_exception(st + switch (regs->msr & SRR1_WAKEMASK) { + case SRR1_WAKEDEC: + set_dec(1); ++ break; + case SRR1_WAKEEE: + /* + * Handle these when interrupts get re-enabled and we take diff --git a/queue-4.14/powerpc-fsl-dts-enable-wa-for-erratum-a-009885-on-fman3l-mdio-buses.patch b/queue-4.14/powerpc-fsl-dts-enable-wa-for-erratum-a-009885-on-fman3l-mdio-buses.patch new file mode 100644 index 00000000000..67899e279fd --- /dev/null +++ b/queue-4.14/powerpc-fsl-dts-enable-wa-for-erratum-a-009885-on-fman3l-mdio-buses.patch @@ -0,0 +1,38 @@ +From 0d375d610fa96524e2ee2b46830a46a7bfa92a9f Mon Sep 17 00:00:00 2001 +From: Tobias Waldekranz +Date: Tue, 18 Jan 2022 22:50:52 +0100 +Subject: powerpc/fsl/dts: Enable WA for erratum A-009885 on fman3l MDIO buses + +From: Tobias Waldekranz + +commit 0d375d610fa96524e2ee2b46830a46a7bfa92a9f upstream. + +This block is used in (at least) T1024 and T1040, including their +variants like T1023 etc. + +Fixes: d55ad2967d89 ("powerpc/mpc85xx: Create dts components for the FSL QorIQ DPAA FMan") +Signed-off-by: Tobias Waldekranz +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi ++++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi +@@ -78,6 +78,7 @@ fman0: fman@400000 { + #size-cells = <0>; + compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + reg = <0xfc000 0x1000>; ++ fsl,erratum-a009885; + }; + + xmdio0: mdio@fd000 { +@@ -85,6 +86,7 @@ fman0: fman@400000 { + #size-cells = <0>; + compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; + reg = <0xfd000 0x1000>; ++ fsl,erratum-a009885; + }; + + ptp_timer0: ptp-timer@fe000 { diff --git a/queue-4.14/series b/queue-4.14/series index 4a950e29c2f..f71aafacb97 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -163,3 +163,5 @@ lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch documentation-refer-to-config-randomize_base-for-kernel-address-space-randomization.patch rdma-hns-modify-the-mapping-attribute-of-doorbell-to-device.patch rdma-rxe-fix-a-typo-in-opcode-name.patch +powerpc-cell-fix-clang-wimplicit-fallthrough-warning.patch +powerpc-fsl-dts-enable-wa-for-erratum-a-009885-on-fman3l-mdio-buses.patch