Skip to contentSkip to conversation

arm64: dts: broadcom: bcm4908: Fix timer node for BCM4906 SoC

PATCH Applied William Zhang 3 participants 7 messages Jul 8, 2022 – Jul 13, 2022 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 arm64: dts: broadcom: bcm4908: Fix timer node for BCM4906 SoC

The cpu mask value in interrupt property inherits from bcm4908.dtsi which sets to four cpus. Correct the value to two cpus for dual core BCM4906 SoC.

Fixes c8b404fb05dc ("arm64: dts: broadcom: bcm4908: add BCM4906

Netgear R8000P DTS files")

---

Changes in v2:
- Split into two patches and add fix reference

 arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi +8 -0
index 66023d553524..d084c33d5ca8 100644
@@ -9,6 +9,14 @@ cpus {
 		/delete-node/ cpu@3;
 	};
 
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+	};
+
 	pmu {
 		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 2/2 arm64: dts: broadcom: bcm4908: Fix cpu node for smp boot

Add spin-table enable-method and cpu-release-addr properties for cpu0 node. This is required by all ARMv8 SoC. Otherwise some bootloader like u-boot can not update cpu-release-addr and linux fails to start up secondary cpus.

Fixes 2961f69f151c ("arm64: dts: broadcom: add BCM4908 and Asus

GT-AC5300 early DTS files")

---

Changes in v2:
- Split into two patches and add fix reference

 arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi +2 -0
index a4be040a00c0..967d2cd3c3ce 100644
@@ -29,6 +29,8 @@ cpu0: cpu@0 {
 			device_type = "cpu";
 			compatible = "brcm,brahma-b53";
 			reg = <0x0>;
+			enable-method = "spin-table";
+			cpu-release-addr = <0x0 0xfff8>;
 			next-level-cache = <&l2>;
 		};
 
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH v2 2/2] arm64: dts: broadcom: bcm4908: Fix cpu node for smp boot

Quoted 5 lines · William Zhang

Add spin-table enable-method and cpu-release-addr properties for cpu0 node. This is required by all ARMv8 SoC. Otherwise some bootloader like u-boot can not update cpu-release-addr and linux fails to start up secondary cpus.

Quoted 7 lines
Fixes 2961f69f151c ("arm64: dts: broadcom: add BCM4908 and Asus

GT-AC5300 early DTS files")

---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree-arm64/fixes, thanks! --
Florian

#3 lore raw
In reply to William Zhang
Quoted 11 lines · William Zhang

The cpu mask value in interrupt property inherits from bcm4908.dtsi which sets to four cpus. Correct the value to two cpus for dual core BCM4906 SoC.

Fixes c8b404fb05dc ("arm64: dts: broadcom: bcm4908: add BCM4906

Netgear R8000P DTS files")

---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree-arm64/fixes, thanks! --
Florian

#4 lore raw
In reply to William Zhang
Quoted 9 lines · William Zhang

The cpu mask value in interrupt property inherits from bcm4908.dtsi which sets to four cpus. Correct the value to two cpus for dual core BCM4906 SoC.

Fixes c8b404fb05dc ("arm64: dts: broadcom: bcm4908: add BCM4906

Netgear R8000P DTS files")

Both look good, thanks!

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#5 lore raw
In reply to William Zhang
Quoted 6 lines · William Zhang

The cpu mask value in interrupt property inherits from bcm4908.dtsi which sets to four cpus. Correct the value to two cpus for dual core BCM4906 SoC.

Fixes c8b404fb05dc ("arm64: dts: broadcom: bcm4908: add BCM4906

Netgear R8000P DTS files")

Well, one note. You shouldn't line break Fixes: line.

Quoted 2 lines

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#6 lore raw
Quoted 9 lines · Rafał Miłecki
Quoted 6 lines · William Zhang

The cpu mask value in interrupt property inherits from bcm4908.dtsi which sets to four cpus. Correct the value to two cpus for dual core BCM4906 SoC.

Fixes c8b404fb05dc ("arm64: dts: broadcom: bcm4908: add BCM4906

Netgear R8000P DTS files")

Well, one note. You shouldn't line break Fixes: line.

Took care of that before applying the two patches:

https://github.com/torvalds/linux/commit/b4a544e415e9be33b37d9bfa9d9f9f4d13f553d6

https://github.com/torvalds/linux/commit/8bd582ae9a71d7f14c4e0c735b2eacaf7516d626

Signature · 1 line
Florian