Skip to contentSkip to conversation

arm64: dts: ti: k3-am65: Change #address-cells and #size-cells of interconnect to 2

PATCH In review Kishon Vijay Abraham I 3 participants 3 messages Sep 5, 2018 – Sep 19, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 arm64: dts: ti: k3-am65: Change #address-cells and #size-cells of interconnect to 2

AM65 has two PCIe controllers and each PCIe controller has '2' address spaces one within the 4GB address space of the SoC and the other above the 4GB address space of the SoC (cbass_main) in addition to the register space. The size of the address space above the 4GB SoC address space is 4GB. These address ranges will be used by CPU/DMA to access the PCIe address space. In order to represent the address space above the 4GB SoC address space and to represent the size of this address space as 4GB, change address-cells and size-cells of interconnect to 2.

Since OSPI has similar need in MCU Domain Memory Map, change address-cells and size-cells of cbass_mcu interconnect also to 2.

Fixes ea47eed33a3fe3d919 ("arm64: dts: ti: Add Support for AM654 SoC")

---
Changes from v2:
Added Fixes tag.

Changes from v1:
Changed address-cells and size-cells of cbass_mcu to "2" since OSPI has a region of size 4GB above the 4GB space.

 arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 10 +++---
 arch/arm64/boot/dts/ti/k3-am65.dtsi      | 44 ++++++++++++------------
 2 files changed, 27 insertions(+), 27 deletions(-)
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +5 -5
index 2409344df4fa..faace3805c01 100644
@@ -8,13 +8,13 @@
 &cbass_main {
 	gic500: interrupt-controller at 1800000 {
 		compatible = "arm,gic-v3";
-		#address-cells = <1>;
-		#size-cells = <1>;
+		#address-cells = <2>;
+		#size-cells = <2>;
 		ranges;
 		#interrupt-cells = <3>;
 		interrupt-controller;
-		reg = <0x01800000 0x10000>,	/* GICD */
-		      <0x01880000 0x90000>;	/* GICR */
+		reg = <0x00 0x01800000 0x00 0x10000>,	/* GICD */
+		      <0x00 0x01880000 0x00 0x90000>;	/* GICR */
 		/*
 		 * vcpumntirq:
 		 * virtual CPU interface maintenance interrupt
@@ -23,7 +23,7 @@
 
 		gic_its: gic-its at 18200000 {
 			compatible = "arm,gic-v3-its";
-			reg = <0x01820000 0x10000>;
+			reg = <0x00 0x01820000 0x00 0x10000>;
 			msi-controller;
 			#msi-cells = <1>;
 		};
arch/arm64/boot/dts/ti/k3-am65.dtsi +22 -22

60 lines not on this page · raw message

Signature · 1 line
2.17.1
maintainer Acked-by on v3 1/1
#1 lore raw
Quoted 12 lines · Kishon Vijay Abraham I

AM65 has two PCIe controllers and each PCIe controller has '2' address spaces one within the 4GB address space of the SoC and the other above the 4GB address space of the SoC (cbass_main) in addition to the register space. The size of the address space above the 4GB SoC address space is 4GB. These address ranges will be used by CPU/DMA to access the PCIe address space. In order to represent the address space above the 4GB SoC address space and to represent the size of this address space as 4GB, change address-cells and size-cells of interconnect to 2.

Since OSPI has similar need in MCU Domain Memory Map, change address-cells and size-cells of cbass_mcu interconnect also to 2.

Quoted 7 lines
Fixes ea47eed33a3fe3d919 ("arm64: dts: ti: Add Support for AM654 SoC")

---
Changes from v2:
Added Fixes tag.

Thanks.

Tero: Could we take this for v4.20 ? While this is a bug fix, I think it might be better in v4.20 window since it will help provide a clean merge of follow on nodes.

Signature · 2 lines
Regards,
Nishanth Menon
#2 lore raw
Quoted 21 lines · Nishanth Menon
Quoted 12 lines · Kishon Vijay Abraham I

AM65 has two PCIe controllers and each PCIe controller has '2' address spaces one within the 4GB address space of the SoC and the other above the 4GB address space of the SoC (cbass_main) in addition to the register space. The size of the address space above the 4GB SoC address space is 4GB. These address ranges will be used by CPU/DMA to access the PCIe address space. In order to represent the address space above the 4GB SoC address space and to represent the size of this address space as 4GB, change address-cells and size-cells of interconnect to 2.

Since OSPI has similar need in MCU Domain Memory Map, change address-cells and size-cells of cbass_mcu interconnect also to 2.

Quoted 7 lines
Fixes ea47eed33a3fe3d919 ("arm64: dts: ti: Add Support for AM654 SoC")

---
Changes from v2:
Added Fixes tag.

Quoted 7 lines

Thanks.

Tero: Could we take this for v4.20 ? While this is a bug fix, I think it might be better in v4.20 window since it will help provide a clean merge of follow on nodes.

Yes, queuing up for 4.20, thanks.

-Tero
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki