Thread (1 message) 1 message, 1 author, 2018-07-05

Re: [PATCH] arm64: dts: marvell: fix CP110 ICU node size

From: Gregory CLEMENT <gregory.clement@bootlin.com>
Date: 2018-07-05 13:28:48
Also in: linux-arm-kernel, lkml, stable

Hi,
 
 On jeu., juil. 05 2018, Gregory CLEMENT [off-list ref] wrote:
Hi Miquel,
 
 On jeu., juil. 05 2018, Miquel Raynal [off-list ref] wrote:
quoted
commit 2f872ddcdb1e8e2186162616cea4581b8403849d upstream.

ICU size in CP110 is not 0x10 but at least 0x440 bytes long (from the
specification).

Fixes: 6ef84a827c37 ("arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K")
Cc: stable@vger.kernel.org # 4.14.x
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
See
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2f872ddcdb1e8e2186162616cea4581b8403849d

it is already in the linux kernel.

Gregory
I missed the comment below and the fact it was for the stable branch.

Sorryt for the noise!

Gregory
quoted
---

Backport to 4.14 stable tree: the original patch did not applied
because of the effort of DT de-duplication that merged two files in one.


 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 +-
 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index 9a7b63cd63a3..7c19f32d0f44 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -169,7 +169,7 @@
 
 			cpm_icu: interrupt-controller@1e0000 {
 				compatible = "marvell,cp110-icu";
-				reg = <0x1e0000 0x10>;
+				reg = <0x1e0000 0x440>;
 				#interrupt-cells = <3>;
 				interrupt-controller;
 				msi-parent = <&gicp>;
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index faf28633a309..150e97a1dfea 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -169,7 +169,7 @@
 
 			cps_icu: interrupt-controller@1e0000 {
 				compatible = "marvell,cp110-icu";
-				reg = <0x1e0000 0x10>;
+				reg = <0x1e0000 0x440>;
 				#interrupt-cells = <3>;
 				interrupt-controller;
 				msi-parent = <&gicp>;
-- 
2.14.1
-- 
Gregory Clement, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
-- 
Gregory Clement, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help