Skip to contentSkip to conversation

arm64: dts: amazon: alpine-v2: add missing io-fabric unit addresses

PATCH Applied Krzysztof Kozlowski 2 participants 6 messages Apr 2, 2024 – Apr 24, 2024

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

PATCH 1/5 arm64: dts: amazon: alpine-v2: add missing io-fabric unit addresses

Add io-fabric unit address, because it has ranges property. This also fixes dtc W=1 warnings:

alpine-v2.dtsi:153.13-229.5: Warning (simple_bus_reg): /soc/io-fabric: simple-bus unit address format error, expected "fc000000"

---
 arch/arm64/boot/dts/amazon/alpine-v2.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amazon/alpine-v2.dtsi +1 -1
index dbf2dce8d1d6..32b6ac8a5352 100644
@@ -150,7 +150,7 @@ msix: msix@fbe00000 {
 			al,msi-num-spis = <160>;
 		};
 
-		io-fabric {
+		io-fabric@fc000000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/5 arm64: dts: amazon: alpine-v2: move non-MMIO node out of soc

Non-MMIO devices should not be within simple-bus, as reported by dtc W=1 warning:

alpine-v2.dtsi:100.9-106.5: Warning (simple_bus_reg): /soc/timer: missing or empty reg/ranges property alpine-v2.dtsi:108.7-114.5: Warning (simple_bus_reg): /soc/pmu: missing or empty reg/ranges property

---
 arch/arm64/boot/dts/amazon/alpine-v2.dtsi | 33 ++++++++++++-----------
 1 file changed, 17 insertions(+), 16 deletions(-)
arch/arm64/boot/dts/amazon/alpine-v2.dtsi +17 -16
index 32b6ac8a5352..5b6b58dd44cb 100644
@@ -39,6 +39,7 @@
 / {
 	model = "Annapurna Labs Alpine v2";
 	compatible = "al,alpine-v2";
+	interrupt-parent = <&gic>;
 	#address-cells = <2>;
 	#size-cells = <2>;
 
@@ -89,6 +90,22 @@ sbclk: sbclk {
 		clock-frequency = <1000000>;
 	};
 
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
+	};
+
+	pmu {
+		compatible = "arm,armv8-pmuv3";
+		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
 	soc {
 		compatible = "simple-bus";
 		#address-cells = <2>;
@@ -97,22 +114,6 @@ soc {
 		interrupt-parent = <&gic>;
 		ranges;
 
-		timer {
-			compatible = "arm,armv8-timer";
-			interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
-				     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
-				     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
-				     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
-		};
-
-		pmu {
-			compatible = "arm,armv8-pmuv3";
-			interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-		};
-
 		gic: interrupt-controller@f0200000 {
 			compatible = "arm,gic-v3";
 			reg = <0x0 0xf0200000 0x0 0x10000>,	/* GIC Dist */
Signature · 1 line
2.34.1
#2 lore raw

PATCH 3/5 arm64: dts: amazon: alpine-v3: add missing io-fabric unit addresses

In reply to Krzysztof Kozlowski

Add io-fabric unit address, because it has ranges property. This also fixes dtc W=1 warnings:

alpine-v2.dtsi:153.13-229.5: Warning (simple_bus_reg): /soc/io-fabric: simple-bus unit address format error, expected "fc000000"

---
 arch/arm64/boot/dts/amazon/alpine-v3.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +1 -1
index 3ea178acdddf..0ab40741f697 100644
@@ -361,7 +361,7 @@ msix: msix@fbe00000 {
 			interrupt-parent = <&gic>;
 		};
 
-		io-fabric {
+		io-fabric@fc000000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
Signature · 1 line
2.34.1
#3 lore raw

PATCH 4/5 arm64: dts: amazon: alpine-v3: drop cache nodes unit addresses

In reply to Krzysztof Kozlowski

Cache device nodes within cpus do not have "reg" property, so should not have unit address, as reported by dtc W=1 warnings:

alpine-v3.dtsi:247.24-254.5: Warning (unit_address_vs_reg): /cpus/cache@0: node has a unit name, but no reg or ranges property alpine-v3.dtsi:256.26-263.5: Warning (unit_address_vs_reg): /cpus/cache@100: node has a unit name, but no reg or ranges property alpine-v3.dtsi:265.26-272.5: Warning (unit_address_vs_reg): /cpus/cache@200: node has a unit name, but no reg or ranges property alpine-v3.dtsi:274.26-281.5: Warning (unit_address_vs_reg): /cpus/cache@300: node has a unit name, but no reg or ranges property

---
 arch/arm64/boot/dts/amazon/alpine-v3.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +4 -4
index 0ab40741f697..3099fdfa9520 100644
@@ -244,7 +244,7 @@ cpu@303 {
 			next-level-cache = <&cluster3_l2>;
 		};
 
-		cluster0_l2: cache@0 {
+		cluster0_l2: cache-0 {
 			compatible = "cache";
 			cache-size = <0x200000>;
 			cache-line-size = <64>;
@@ -253,7 +253,7 @@ cluster0_l2: cache@0 {
 			cache-unified;
 		};
 
-		cluster1_l2: cache@100 {
+		cluster1_l2: cache-100 {
 			compatible = "cache";
 			cache-size = <0x200000>;
 			cache-line-size = <64>;
@@ -262,7 +262,7 @@ cluster1_l2: cache@100 {
 			cache-unified;
 		};
 
-		cluster2_l2: cache@200 {
+		cluster2_l2: cache-200 {
 			compatible = "cache";
 			cache-size = <0x200000>;
 			cache-line-size = <64>;
@@ -271,7 +271,7 @@ cluster2_l2: cache@200 {
 			cache-unified;
 		};
 
-		cluster3_l2: cache@300 {
+		cluster3_l2: cache-300 {
 			compatible = "cache";
 			cache-size = <0x200000>;
 			cache-line-size = <64>;
Signature · 1 line
2.34.1
#4 lore raw

PATCH 5/5 arm64: dts: amazon: alpine-v3: correct gic unit addresses

In reply to Krzysztof Kozlowski

Correct gic unit addresses to fix dtc W=1 warnings:

alpine-v3.dtsi:321.38-331.5: Warning (simple_bus_reg): /soc/interrupt-controller@f0000000: simple-bus unit address format error, expected "f0800000"

---
 arch/arm64/boot/dts/amazon/alpine-v3.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amazon/alpine-v3.dtsi +1 -1
index 3099fdfa9520..8b6156b5af65 100644
@@ -318,7 +318,7 @@ soc {
 		#size-cells = <2>;
 		ranges;
 
-		gic: interrupt-controller@f0000000 {
+		gic: interrupt-controller@f0800000 {
 			compatible = "arm,gic-v3";
 			#interrupt-cells = <3>;
 			interrupt-controller;
Signature · 1 line
2.34.1
#5 lore raw
In reply to Krzysztof Kozlowski
Quoted 6 lines · Krzysztof Kozlowski

Add io-fabric unit address, because it has ranges property. This also fixes dtc W=1 warnings:

alpine-v2.dtsi:153.13-229.5: Warning (simple_bus_reg): /soc/io-fabric: simple-bus unit address format error, expected "fc000000"

Almost a month passed, no replies from maintainers about picking it up. Dunno, looks abandoned, so let me grab this. If anyone else wants to pick it up, let me know.

Applied, thanks!

[1/5] arm64: dts: amazon: alpine-v2: add missing io-fabric unit addresses

      https://git.kernel.org/krzk/linux-dt/c/0d8ec5c9415f3ac1a8dd02bc8ec31db240d3329a
[2/5] arm64: dts: amazon: alpine-v2: move non-MMIO node out of soc
      https://git.kernel.org/krzk/linux-dt/c/c92b25ab66e76e197353761d5631e1a3299e777a
[3/5] arm64: dts: amazon: alpine-v3: add missing io-fabric unit addresses
      https://git.kernel.org/krzk/linux-dt/c/4c8bdd35ec797dc083cbc6ed30a5a41f471d6c8d
[4/5] arm64: dts: amazon: alpine-v3: drop cache nodes unit addresses
      https://git.kernel.org/krzk/linux-dt/c/6f7be4b3d912b22b708fe444ba11afa521068b21
[5/5] arm64: dts: amazon: alpine-v3: correct gic unit addresses
      https://git.kernel.org/krzk/linux-dt/c/b5efd50d10295ce732ee9c2e546245ad4b9c8db5

Best regards,

Signature · 1 line
Krzysztof Kozlowski <[email protected]>