5.4-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-5.4/powerpc-cell-fix-clang-wimplicit-fallthrough-warning.patch b/queue-5.4/powerpc-cell-fix-clang-wimplicit-fallthrough-warning.patch
new file mode 100644 (file)
index 0000000..416f850
--- /dev/null
+++ b/queue-5.4/powerpc-cell-fix-clang-wimplicit-fallthrough-warning.patch
@@ -0,0 +1,47 @@
+From e89257e28e844f5d1d39081bb901d9f1183a7705 Mon Sep 17 00:00:00 2001
+From: Anders Roxell <anders.roxell@linaro.org>
+Date: Tue, 7 Dec 2021 12:02:28 +0100
+Subject: powerpc/cell: Fix clang -Wimplicit-fallthrough warning
+
+From: Anders Roxell <anders.roxell@linaro.org>
+
+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 <naresh.kamboju@linaro.org>
+Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
+Reviewed-by: Nathan Chancellor <nathan@kernel.org>
+Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/20211207110228.698956-1-anders.roxell@linaro.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -77,6 +77,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-5.4/powerpc-fsl-dts-enable-wa-for-erratum-a-009885-on-fman3l-mdio-buses.patch b/queue-5.4/powerpc-fsl-dts-enable-wa-for-erratum-a-009885-on-fman3l-mdio-buses.patch
new file mode 100644 (file)
index 0000000..49f1f30
--- /dev/null
+++ b/queue-5.4/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 <tobias@waldekranz.com>
+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 <tobias@waldekranz.com>
+
+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 <tobias@waldekranz.com>
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -79,6 +79,7 @@ fman0: fman@400000 {
+               #size-cells = <0>;
+               compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
+               reg = <0xfc000 0x1000>;
++              fsl,erratum-a009885;
+       };
+ 
+       xmdio0: mdio@fd000 {
+@@ -86,6 +87,7 @@ fman0: fman@400000 {
+               #size-cells = <0>;
+               compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
+               reg = <0xfd000 0x1000>;
++              fsl,erratum-a009885;
+       };
+ };
+ 

diff --git a/queue-5.4/series b/queue-5.4/series
index 11f36e1bb1ffc3a6f02f937fea0a7275bc355c88..b8cbbd25062ca345a469c795aa40142afec04301 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -284,3 +284,5 @@ rdma-hns-modify-the-mapping-attribute-of-doorbell-to-device.patch
 rdma-rxe-fix-a-typo-in-opcode-name.patch
 dmaengine-stm32-mdma-fix-stm32_mdma_ctbr_tsel_mask.patch
 revert-net-mlx5-add-retry-mechanism-to-the-command-entry-index-allocation.patch
+powerpc-cell-fix-clang-wimplicit-fallthrough-warning.patch
+powerpc-fsl-dts-enable-wa-for-erratum-a-009885-on-fman3l-mdio-buses.patch