Skip to contentSkip to conversation

arm64: dts: layerscape: Fix GICv3 ITS node names

PATCH Applied Rob Herring 3 participants 3 messages Feb 8, 2023 – Mar 13, 2023

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 arm64: dts: layerscape: Fix GICv3 ITS node names

The GICv3 ITS is an MSI controller, therefore its node name should be 'msi-controller'.

Signed-off-by Rob Herring <[email protected]>

---
Note that this exposes an issue that #msi-cells is missing. In turn, the use of msi-parent in PCI nodes is wrong and should be msi-map according to my sources (Robin M), but I have no idea what is correct there.

 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +-
 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +-
 arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +1 -1
index 1b33cabb4e14..dd1c8f60fad1 100644
@@ -131,7 +131,7 @@ gic: interrupt-controller@6000000 {
 		interrupt-controller;
 		interrupts = <GIC_PPI 9 (GIC_CPU_MASK_RAW(0xf) |
 					 IRQ_TYPE_LEVEL_LOW)>;
-		its: gic-its@6020000 {
+		its: msi-controller@6020000 {
 			compatible = "arm,gic-v3-its";
 			msi-controller;
 			reg = <0x0 0x06020000 0 0x20000>;/* GIC Translater */
arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +1 -1
index 260d045dbd9a..6dd680fb1b22 100644
@@ -123,7 +123,7 @@ gic: interrupt-controller@6000000 {
 		#size-cells = <2>;
 		ranges;
 
-		its: gic-its@6020000 {
+		its: msi-controller@6020000 {
 			compatible = "arm,gic-v3-its";
 			msi-controller;
 			reg = <0x0 0x6020000 0 0x20000>;
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +1 -1
index 348d9e3a9125..d2f5345d0560 100644
@@ -60,7 +60,7 @@ gic: interrupt-controller@6000000 {
 		interrupt-controller;
 		interrupts = <1 9 0x4>;
 
-		its: gic-its@6020000 {
+		its: msi-controller@6020000 {
 			compatible = "arm,gic-v3-its";
 			msi-controller;
 			reg = <0x0 0x6020000 0 0x20000>;
arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +1 -1
index 50c19e8405d5..ea6a94b57aeb 100644
@@ -395,7 +395,7 @@ gic: interrupt-controller@6000000 {
 		interrupt-controller;
 		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
 
-		its: gic-its@6020000 {
+		its: msi-controller@6020000 {
 			compatible = "arm,gic-v3-its";
 			msi-controller;
 			reg = <0x0 0x6020000 0 0x20000>;
Signature · 1 line
2.39.1
#1 lore raw
Quoted 8 lines · Rob Herring

The GICv3 ITS is an MSI controller, therefore its node name should be 'msi-controller'.

Signed-off-by Rob Herring <[email protected]>

---
Note that this exposes an issue that #msi-cells is missing. In turn, the use of msi-parent in PCI nodes is wrong and should be msi-map according to my sources (Robin M), but I have no idea what is correct there.

This is a funny one, since AIUI those "msi-parent" properties are now really only there for the bootloader to pick up the phandle to build a proper "msi-map" property[1][2]. As such, I imagine it should *probably* be OK to add a dummy argument so that "#msi-cells = <1>" can be correctly specified, however I can't claim to be an expert on these systems and whether there are any other bootloader behaviours that also need to be supported.

Thanks,
Robin.

[1] https://source.denx.de/u-boot/u-boot/-/blob/master/drivers/net/fsl-mc/mc.c#L328
[2] https://source.denx.de/u-boot/u-boot/-/blob/master/drivers/pci/pcie_layerscape_fixup.c

Quoted 58 lines
  arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +-
  arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +-
  arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +-
  arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +1 -1
index 1b33cabb4e14..dd1c8f60fad1 100644
@@ -131,7 +131,7 @@ gic: interrupt-controller@6000000 {
  		interrupt-controller;
  		interrupts = <GIC_PPI 9 (GIC_CPU_MASK_RAW(0xf) |
  					 IRQ_TYPE_LEVEL_LOW)>;
-		its: gic-its@6020000 {
+		its: msi-controller@6020000 {
  			compatible = "arm,gic-v3-its";
  			msi-controller;
  			reg = <0x0 0x06020000 0 0x20000>;/* GIC Translater */
arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +1 -1
index 260d045dbd9a..6dd680fb1b22 100644
@@ -123,7 +123,7 @@ gic: interrupt-controller@6000000 {
  		#size-cells = <2>;
  		ranges;
 
-		its: gic-its@6020000 {
+		its: msi-controller@6020000 {
  			compatible = "arm,gic-v3-its";
  			msi-controller;
  			reg = <0x0 0x6020000 0 0x20000>;
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +1 -1
index 348d9e3a9125..d2f5345d0560 100644
@@ -60,7 +60,7 @@ gic: interrupt-controller@6000000 {
  		interrupt-controller;
  		interrupts = <1 9 0x4>;
 
-		its: gic-its@6020000 {
+		its: msi-controller@6020000 {
  			compatible = "arm,gic-v3-its";
  			msi-controller;
  			reg = <0x0 0x6020000 0 0x20000>;
arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +1 -1
index 50c19e8405d5..ea6a94b57aeb 100644
@@ -395,7 +395,7 @@ gic: interrupt-controller@6000000 {
  		interrupt-controller;
  		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
 
-		its: gic-its@6020000 {
+		its: msi-controller@6020000 {
  			compatible = "arm,gic-v3-its";
  			msi-controller;
  			reg = <0x0 0x6020000 0 0x20000>;