Skip to contentSkip to conversation

dt-bindings: watchdog: sunxi: Add H6 compatible

PATCH Applied Clément Péron 3 participants 11 messages Apr 4, 2019 – Apr 8, 2019

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

PATCH 1/2 dt-bindings: watchdog: sunxi: Add H6 compatible

H6 WDT is compatible with A31, so add this in the device-tree bindings.

---
 Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +1 -0
index 46055254e8dd..e65198d82a2b 100644
@@ -6,6 +6,7 @@ Required properties:
 	"allwinner,sun4i-a10-wdt"
 	"allwinner,sun6i-a31-wdt"
 	"allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"
+	"allwinner,sun50i-h6-wdt","allwinner,sun6i-a31-wdt"
 	"allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt"
 - reg : Specifies base physical address and size of the registers.
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 arm64: dts: h6: Add watchdog node

Allwinner H6 has a watchog compatible with A31.

Declare it in the device tree.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +6 -0
index bc5dc44171b7..3c2d6d0538b7 100644
@@ -203,6 +203,12 @@
 			#reset-cells = <1>;
 		};
 
+		watchdog@30090a0 {
+			compatible = "allwinner,sun50i-h6-wdt","allwinner,sun6i-a31-wdt";
+			reg = <0x030090a0 0x20>;
+			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+		};
+
 		pio: pinctrl@300b000 {
 			compatible = "allwinner,sun50i-h6-pinctrl";
 			reg = <0x0300b000 0x400>;
Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH 2/2] arm64: dts: h6: Add watchdog node

Quoted 10 lines · Maxime Ripard
Quoted 5 lines · Clément Péron

Allwinner H6 has a watchog compatible with A31.

Declare it in the device tree.

Applied both, thanks!
Maxime

IIRC there are 3 watchdogs on the H6. One is the trusted watchdog, which should be reserved for underlying firmware.

The other two are the normal and R-block watchdog. Although they look the same, the "normal" one can't reset the system. :( That one is actually the one ATF currently uses. So reboot doesn't work on the H6.

ChenYu

#4 lore raw

Re: [PATCH 2/2] arm64: dts: h6: Add watchdog node

Quoted 12 lines · Chen-Yu Tsai
Quoted 10 lines · Maxime Ripard
Quoted 5 lines · Clément Péron

Allwinner H6 has a watchog compatible with A31.

Declare it in the device tree.

Applied both, thanks!
Maxime

Quoted 7 lines

IIRC there are 3 watchdogs on the H6. One is the trusted watchdog, which should be reserved for underlying firmware.

The other two are the normal and R-block watchdog. Although they look the same, the "normal" one can't reset the system. :( That one is actually the one ATF currently uses. So reboot doesn't work on the H6.

So that patch will not do anything then?

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#5 lore raw

Re: [PATCH 2/2] arm64: dts: h6: Add watchdog node

Quoted 17 lines · Maxime Ripard
Quoted 15 lines · Chen-Yu Tsai
Quoted 10 lines · Maxime Ripard
Quoted 5 lines · Clément Péron

Allwinner H6 has a watchog compatible with A31.

Declare it in the device tree.

Applied both, thanks!
Maxime

IIRC there are 3 watchdogs on the H6. One is the trusted watchdog, which should be reserved for underlying firmware.

Quoted 6 lines
Quoted 4 lines

The other two are the normal and R-block watchdog. Although they look the same, the "normal" one can't reset the system. :( That one is actually the one ATF currently uses. So reboot doesn't work on the H6.

So that patch will not do anything then?

I'm still on vacation, so I haven't checked the address of the new device. If it's the normal one, then yeah, it won't do anything. I've tried that. IIRC Samuel (or someone else) on IRC also mentioned this.

ChenYu

#6 lore raw

Re: [PATCH 2/2] arm64: dts: h6: Add watchdog node

Quoted 23 lines · Chen-Yu Tsai
Quoted 22 lines · Maxime Ripard
Quoted 19 lines · Chen-Yu Tsai
Quoted 10 lines · Maxime Ripard
Quoted 5 lines · Clément Péron

Allwinner H6 has a watchog compatible with A31.

Declare it in the device tree.

Applied both, thanks!
Maxime

IIRC there are 3 watchdogs on the H6. One is the trusted watchdog, which should be reserved for underlying firmware.

The other two are the normal and R-block watchdog. Although they look the same, the "normal" one can't reset the system. :( That one is actually the one ATF currently uses. So reboot doesn't work on the H6.

Quoted 5 lines
Quoted 1 line

So that patch will not do anything then?

I'm still on vacation, so I haven't checked the address of the new device. If it's the normal one, then yeah, it won't do anything. I've tried that. IIRC Samuel (or someone else) on IRC also mentioned this.

It's the one in the timer that we've used since pretty much day 1 on older SoCs, so I guess it qualifies as the normal one :)

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#7 lore raw

Re: [PATCH 2/2] arm64: dts: h6: Add watchdog node

Hi,

Quoted 17 lines · Maxime Ripard
Quoted 15 lines · Chen-Yu Tsai
Quoted 14 lines · Maxime Ripard
Quoted 12 lines · Chen-Yu Tsai
Quoted 10 lines · Maxime Ripard
Quoted 5 lines · Clément Péron

Allwinner H6 has a watchog compatible with A31.

Declare it in the device tree.

Applied both, thanks!
Maxime

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

IIRC there are 3 watchdogs on the H6. One is the trusted watchdog, which should be reserved for underlying firmware.

The other two are the normal and R-block watchdog. Although they look the same, the "normal" one can't reset the system. :( That one is actually the one ATF currently uses. So reboot doesn't work on the H6.

Some users report that the reboot on the PineH64 actually works.

Clement

Quoted 16 lines
Quoted 6 lines
Quoted 2 lines

So that patch will not do anything then?

I'm still on vacation, so I haven't checked the address of the new device. If it's the normal one, then yeah, it won't do anything. I've tried that. IIRC Samuel (or someone else) on IRC also mentioned this.

It's the one in the timer that we've used since pretty much day 1 on older SoCs, so I guess it qualifies as the normal one :)

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#8 lore raw

Re: [PATCH 2/2] arm64: dts: h6: Add watchdog node

Hi,

Quoted 24 lines · Clément Péron

Hi,

Quoted 20 lines · Maxime Ripard
Quoted 18 lines · Chen-Yu Tsai
Quoted 17 lines · Maxime Ripard
Quoted 15 lines · Chen-Yu Tsai
Quoted 10 lines · Maxime Ripard
Quoted 5 lines · Clément Péron

Allwinner H6 has a watchog compatible with A31.

Declare it in the device tree.

Applied both, thanks!
Maxime

IIRC there are 3 watchdogs on the H6. One is the trusted watchdog, which should be reserved for underlying firmware.

Quoted 11 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

The other two are the normal and R-block watchdog. Although they look the same, the "normal" one can't reset the system. :( That one is actually the one ATF currently uses. So reboot doesn't work on the H6.

Some users report that the reboot on the PineH64 actually works.

Clement

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

So that patch will not do anything then?

Did some test and only interrupts are working right now. If the WDOG is configured to make the board reboot the system will be stuck :S Maybe better to disabled it for now and leave a comment. I will try to ask some Pine H64 users to do the same tests.

Test done on my Beelink GS1 :
/* This should reset the system after 0.5s */

# devmem $((0x030090a0 + 0x0014))
0x00000001
# devmem $((0x030090a0 + 0x0018))
0x00000000
# devmem $((0x030090a0 + 0x0018)) 32 0x1
#
/* System is Stuck*/

/* This should reset the system after 1s */

# devmem $((0x030090a0 + 0x0014))
0x00000001
# devmem $((0x030090a0 + 0x0018))
0x00000000
# devmem $((0x030090a0 + 0x0018)) 32 $((0x1 << 4 | 0x1))
#
/* System is Stuck*/

/* This should reset the system after 1s (as recommended in the User Manual) */

# devmem $((0x030090a0 + 0x0014))
0x00000001
# devmem $((0x030090a0 + 0x0018))
0x00000000
# devmem $((0x030090a0 + 0x0018)) 32 $((0x1 << 4))
# devmem $((0x030090a0 + 0x0018))
0x00000010
# devmem $((0x030090a0 + 0x0018)) 32 $((0x1 << 4 | 0x1))
#
/* System is Stuck*/

/* This should trig an interrupt after 0.5s */

# devmem $((0x030090a0 + 0x0014)) 32 0x32
# devmem $((0x030090a0 + 0x0014))
0x00000002
# devmem $((0x030090a0 + 0x0018))
0x00000000
# devmem $((0x030090a0 + 0x0018)) 32 $((0x1 << 4 | 0x1))
# devmem $((0x030090a0 + 0x0004))
0x00000001
/* INT is triggered */

Regards,
Clement

Quoted 14 lines
Quoted 14 lines
Quoted 4 lines

I'm still on vacation, so I haven't checked the address of the new device. If it's the normal one, then yeah, it won't do anything. I've tried that. IIRC Samuel (or someone else) on IRC also mentioned this.

It's the one in the timer that we've used since pretty much day 1 on older SoCs, so I guess it qualifies as the normal one :)

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#9 lore raw

Re: [PATCH 2/2] arm64: dts: h6: Add watchdog node

Quoted 34 lines · Clément Péron

Hi,

Quoted 31 lines · Clément Péron

Hi,

Quoted 17 lines · Maxime Ripard
Quoted 15 lines · Chen-Yu Tsai
Quoted 14 lines · Maxime Ripard
Quoted 12 lines · Chen-Yu Tsai
Quoted 10 lines · Maxime Ripard
Quoted 5 lines · Clément Péron

Allwinner H6 has a watchog compatible with A31.

Declare it in the device tree.

Applied both, thanks!
Maxime

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

IIRC there are 3 watchdogs on the H6. One is the trusted watchdog, which should be reserved for underlying firmware.

The other two are the normal and R-block watchdog. Although they look the same, the "normal" one can't reset the system. :( That one is actually the one ATF currently uses. So reboot doesn't work on the H6.

Some users report that the reboot on the PineH64 actually works.

Quoted 8 lines
Quoted 4 lines

Clement

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

So that patch will not do anything then?

Did some test and only interrupts are working right now. If the WDOG is configured to make the board reboot the system will be stuck :S Maybe better to disabled it for now and leave a comment.

I dropped the two patches

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#10 lore raw

Re: [PATCH 2/2] arm64: dts: h6: Add watchdog node

Quoted 39 lines · Maxime Ripard
Quoted 37 lines · Clément Péron

Hi,

Quoted 34 lines · Clément Péron

Hi,

Quoted 17 lines · Maxime Ripard
Quoted 15 lines · Chen-Yu Tsai
Quoted 14 lines · Maxime Ripard
Quoted 12 lines · Chen-Yu Tsai
Quoted 10 lines · Maxime Ripard
Quoted 5 lines · Clément Péron

Allwinner H6 has a watchog compatible with A31.

Declare it in the device tree.

Applied both, thanks!
Maxime

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

IIRC there are 3 watchdogs on the H6. One is the trusted watchdog, which should be reserved for underlying firmware.

The other two are the normal and R-block watchdog. Although they look the same, the "normal" one can't reset the system. :( That one is actually the one ATF currently uses. So reboot doesn't work on the H6.

Some users report that the reboot on the PineH64 actually works.

Clement

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

So that patch will not do anything then?

Did some test and only interrupts are working right now. If the WDOG is configured to make the board reboot the system will be stuck :S Maybe better to disabled it for now and leave a comment.

I dropped the two patches

What do you think about having it but disabled with a comment ?

I have tested the r_watchdog and this one is functionnal.

Clement

Quoted 7 lines

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com