Allwinner H6 watchdog support
v3 cover Allwinner H6 watchdog support
Hi,
Allwinner H6 SoC has two watchdogs.
As we are not sure that both A64 and H6 are stricly identical, I have introduced the H6 bindings.
After investigation it seems that on some boards the first watchdog doesn't make it properly reboot. Please see details in the commit log.
I think it's proper to add it with a comment anyway.
The r_watchdog is still available and usable on all the H6 boards.
Maybe it would be proper to introduce a "allwinner,sun50i-h6-r-wdt" bindings?
Thanks,
Clément
Changes since v2:
- Reintroduce H6 bindings
- Add watchdog Maintainters / ML
- Add Martin Ayotte test results
Changes since v1:
- Use A64 compatible instead of H6
- Remove dt-bindings patch
- Change watchdog status to disabled
- Add r_watchdog node patch
- Add enable sunxi watchdog patch
Clément Péron (4):
dt-bindings: watchdog: add Allwinner H6 watchdog
arm64: dts: allwinner: h6: add watchdog node
arm64: dts: allwinner: h6: add r_watchog node
arm64: defconfig: enable sunxi watchdog
.../devicetree/bindings/watchdog/sunxi-wdt.txt | 10 ++++++---- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 18 ++++++++++++++++++ arch/arm64/configs/defconfig | 1 + 3 files changed, 25 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/4 dt-bindings: watchdog: add Allwinner H6 watchdog
Allwinner H6 has a similar watchdog as the A64 which is already a compatible of the A31.
This commit sort the lines and add the H6 compatible.
--- .../devicetree/bindings/watchdog/sunxi-wdt.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +6 -4
@@ -3,10 +3,12 @@ Allwinner SoCs Watchdog timer Required properties: - compatible : should be one of - "allwinner,sun4i-a10-wdt" - "allwinner,sun6i-a31-wdt" - "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt" - "allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt" + - "allwinner,sun4i-a10-wdt" + - "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt" + - "allwinner,sun50i-h6-wdt","allwinner,sun50i-a64-wdt", + "allwinner,sun6i-a31-wdt" + - "allwinner,sun6i-a31-wdt" + - "allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt" - reg : Specifies base physical address and size of the registers. Optional properties:
Signature · 1 line
2.17.1
Re: [PATCH v3 1/4] dt-bindings: watchdog: add Allwinner H6 watchdog
Quoted 15 lines · Clément Péron
Allwinner H6 has a similar watchdog as the A64 which is already a compatible of the A31.
This commit sort the lines and add the H6 compatible.
Signed-off-by Clément Péron <[email protected]>--- .../devicetree/bindings/watchdog/sunxi-wdt.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +0
-0
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt Allwinner SoCs Watchdog timer · line 9
Quoted 7 lines
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +0
-4@@ -3,10 +3,12 @@ Allwinner SoCs Watchdog timer Required properties: - compatible : should be one of - "allwinner,sun4i-a10-wdt" - "allwinner,sun6i-a31-wdt" - "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt" - "allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt"
That sorting was kind of intentional
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt Allwinner SoCs Watchdog timer · line 9
Quoted 4 lines
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +4
-0+ - "allwinner,sun4i-a10-wdt" + - "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt" + - "allwinner,sun50i-h6-wdt","allwinner,sun50i-a64-wdt", + "allwinner,sun6i-a31-wdt"
Is there a reason to keep the A64 compatible?
Thanks,
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Re: [PATCH v3 1/4] dt-bindings: watchdog: add Allwinner H6 watchdog
Hi Maxime,
Quoted 19 lines · Maxime Ripard
Quoted 17 lines · Clément Péron
Allwinner H6 has a similar watchdog as the A64 which is already a compatible of the A31.
This commit sort the lines and add the H6 compatible.
Signed-off-by Clément Péron <[email protected]>--- .../devicetree/bindings/watchdog/sunxi-wdt.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +0
-0@@ -3,10 +3,12 @@ Allwinner SoCs Watchdog timer Required properties:
Quoted 7 lines
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt Allwinner SoCs Watchdog timer · line 9
Quoted 5 lines
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +0
-4- compatible : should be one of - "allwinner,sun4i-a10-wdt" - "allwinner,sun6i-a31-wdt" - "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt" - "allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt"That sorting was kind of intentional
Arg indeed, I will remove it.
Quoted 7 lines
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt Allwinner SoCs Watchdog timer · line 9
Quoted 5 lines
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +4
-0+ - "allwinner,sun4i-a10-wdt" + - "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt" + - "allwinner,sun50i-h6-wdt","allwinner,sun50i-a64-wdt", + "allwinner,sun6i-a31-wdt"Is there a reason to keep the A64 compatible?
Yes, A64 and H6 has the exact same memory mapping looking at the datasheet. So if there is an errata or a new feature for the A64, it should be also compatible with the H6.
Which is not the case with A31 (WDT_KEY_FIELD is not preset)
Thanks,
Clement
Quoted 8 lines
Thanks,
Maxime--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Re: [PATCH v3 1/4] dt-bindings: watchdog: add Allwinner H6 watchdog
Quoted 6 lines · Clément Péron
Quoted 6 lines
Quoted 5 lines
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +4
-0+ - "allwinner,sun4i-a10-wdt" + - "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt" + - "allwinner,sun50i-h6-wdt","allwinner,sun50i-a64-wdt", + "allwinner,sun6i-a31-wdt"
Quoted 6 lines
Quoted 1 line
Is there a reason to keep the A64 compatible?
Yes, A64 and H6 has the exact same memory mapping looking at the datasheet. So if there is an errata or a new feature for the A64, it should be also compatible with the H6.
Which is not the case with A31 (WDT_KEY_FIELDis not preset)
The thing is, if you use those three compatibles, then you're saying that it's ok for the OS to use first the H6 driver, then the A64 driver, and then the A31 driver.
If the A31 isn't compatible, then it shouldn't be listed there. And if it is, then you can skip the A64 compatible.
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Re: [PATCH v3 1/4] dt-bindings: watchdog: add Allwinner H6 watchdog
Quoted 15 lines · Maxime Ripard
Quoted 6 lines · Clément Péron
Quoted 6 lines
Quoted 5 lines
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +4
-0+ - "allwinner,sun4i-a10-wdt" + - "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt" + - "allwinner,sun50i-h6-wdt","allwinner,sun50i-a64-wdt", + "allwinner,sun6i-a31-wdt"Quoted 6 lines
Quoted 1 line
Is there a reason to keep the A64 compatible?
Yes, A64 and H6 has the exact same memory mapping looking at the datasheet. So if there is an errata or a new feature for the A64, it should be also compatible with the H6.
Which is not the case with A31 (WDT_KEY_FIELDis not preset)
Quoted 6 lines
The thing is, if you use those three compatibles, then you're saying that it's ok for the OS to use first the H6 driver, then the A64 driver, and then the A31 driver.
If the A31 isn't compatible, then it shouldn't be listed there. And if it is, then you can skip the A64 compatible.
Hi Maxime,
I'm just supposing that A31 is the version 1.0 of the IP, A64 is the version 1.1 and H6 is 1.2.
And if an issue is found for A64 there is more chance that we will have to fix it also for H6.
But bindings the driver with :
"allwinner,sun50i-h6-wdt","allwinner,sun50i-a31-wdt" is also fine for me.
Regards,
Clement
Quoted 7 lines
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
PATCH v3 2/4 arm64: dts: allwinner: h6: add watchdog node
In reply to Clément PéronAllwinner H6 has a watchog node which seems broken on some boards.
Test has been performed on several boards.
Chen-Yu Tsai boards:
Pine H64 - H6448BA 7782 => OK
OrangePi Lite 2 - H8068BA 61C2 => KO
Martin Ayotte boards:
Pine H64 - H8069BA 6892 => OK
OrangePi 3 - HA047BA 69W2 => KO
OrangePi One Plus - H7310BA 6842 => KO
OrangePi Lite2 - H6448BA 6662 => KO
Clément Péron board:
Beelink GS1 - H7309BA 6842 => KO
As it seems not fixable for now, declare the node
but leave it disable with a comment.
--- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +10 -0
@@ -208,6 +208,16 @@ reg = <0x03006000 0x400>; }; + watchdog: watchdog@30090a0 { + compatible = "allwinner,sun50i-h6-wdt", + "allwinner,sun50i-a64-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x030090a0 0x20>; + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; + /* Broken on some H6 boards */ + status = "disabled"; + }; + pio: pinctrl@300b000 { compatible = "allwinner,sun50i-h6-pinctrl"; reg = <0x0300b000 0x400>;
Signature · 1 line
2.17.1
Re: [PATCH v3 2/4] arm64: dts: allwinner: h6: add watchdog node
Quoted 15 lines · Clément Péron
Allwinner H6 has a watchog node which seems broken on some boards.
Test has been performed on several boards.
Chen-Yu Tsai boards:
Pine H64 - H6448BA 7782 => OK
OrangePi Lite 2 - H8068BA 61C2 => KOMartin Ayotte boards:
Pine H64 - H8069BA 6892 => OK
OrangePi 3 - HA047BA 69W2 => KO
OrangePi One Plus - H7310BA 6842 => KO
OrangePi Lite2 - H6448BA 6662 => KO
Quoted 7 lines
Clément Péron board:
Beelink GS1 - H7309BA 6842 => KOAs it seems not fixable for now, declare the node
but leave it disable with a comment.Signed-off-by Clément Péron <[email protected]>
If it doesn't work most boards, then why do we need to merge that patch in the first place?
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Re: [PATCH v3 2/4] arm64: dts: allwinner: h6: add watchdog node
Hi,
Quoted 20 lines · Maxime Ripard
Quoted 18 lines · Clément Péron
Allwinner H6 has a watchog node which seems broken on some boards.
Test has been performed on several boards.
Chen-Yu Tsai boards:
Pine H64 - H6448BA 7782 => OK
OrangePi Lite 2 - H8068BA 61C2 => KOMartin Ayotte boards:
Pine H64 - H8069BA 6892 => OK
OrangePi 3 - HA047BA 69W2 => KO
OrangePi One Plus - H7310BA 6842 => KO
OrangePi Lite2 - H6448BA 6662 => KOClément Péron board:
Beelink GS1 - H7309BA 6842 => KO
Quoted 7 lines
Quoted 4 lines
As it seems not fixable for now, declare the node
but leave it disable with a comment.Signed-off-by Clément Péron <[email protected]>If it doesn't work most boards, then why do we need to merge that patch in the first place?
My personnal opinion, is that having the IP declared and disabled with a comment saying "it's broken on some boards" in the device-tree is better than not having at all.
This will explicit say "the IP exist but don't use it!". Maybe some people with a functionnal board would like to explicitly use it on their dts.
Again just my personnal opinion,
Thanks for the review,
Clément
Quoted 7 lines
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Re: [PATCH v3 2/4] arm64: dts: allwinner: h6: add watchdog node
Quoted 31 lines · Clément Péron
Hi,
Quoted 20 lines · Maxime Ripard
Quoted 18 lines · Clément Péron
Allwinner H6 has a watchog node which seems broken on some boards.
Test has been performed on several boards.
Chen-Yu Tsai boards:
Pine H64 - H6448BA 7782 => OK
OrangePi Lite 2 - H8068BA 61C2 => KOMartin Ayotte boards:
Pine H64 - H8069BA 6892 => OK
OrangePi 3 - HA047BA 69W2 => KO
OrangePi One Plus - H7310BA 6842 => KO
OrangePi Lite2 - H6448BA 6662 => KOClément Péron board:
Beelink GS1 - H7309BA 6842 => KOQuoted 7 lines
Quoted 4 lines
As it seems not fixable for now, declare the node
but leave it disable with a comment.Signed-off-by Clément Péron <[email protected]>If it doesn't work most boards, then why do we need to merge that patch in the first place?
Quoted 7 lines
My personnal opinion, is that having the IP declared and disabled with a comment saying "it's broken on some boards" in the device-tree is better than not having at all.
This will explicit say "the IP exist but don't use it!". Maybe some people with a functionnal board would like to explicitly use it on their dts.
Yeah, that makes sense. Chen-Yu, any opinion on the matter?
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Re: [PATCH v3 2/4] arm64: dts: allwinner: h6: add watchdog node
Quoted 37 lines · Maxime Ripard
Quoted 35 lines · Clément Péron
Hi,
Quoted 20 lines · Maxime Ripard
Quoted 18 lines · Clément Péron
Allwinner H6 has a watchog node which seems broken on some boards.
Test has been performed on several boards.
Chen-Yu Tsai boards:
Pine H64 - H6448BA 7782 => OK
OrangePi Lite 2 - H8068BA 61C2 => KOMartin Ayotte boards:
Pine H64 - H8069BA 6892 => OK
OrangePi 3 - HA047BA 69W2 => KO
OrangePi One Plus - H7310BA 6842 => KO
OrangePi Lite2 - H6448BA 6662 => KOClément Péron board:
Beelink GS1 - H7309BA 6842 => KOQuoted 7 lines
Quoted 4 lines
As it seems not fixable for now, declare the node
but leave it disable with a comment.Signed-off-by Clément Péron <[email protected]>If it doesn't work most boards, then why do we need to merge that patch in the first place?
My personnal opinion, is that having the IP declared and disabled with a comment saying "it's broken on some boards" in the device-tree is better than not having at all.
Quoted 5 lines
Quoted 3 lines
This will explicit say "the IP exist but don't use it!". Maybe some people with a functionnal board would like to explicitly use it on their dts.
Yeah, that makes sense. Chen-Yu, any opinion on the matter?
Works for me.
PATCH v3 3/4 arm64: dts: allwinner: h6: add r_watchog node
In reply to Clément PéronAllwinner H6 has a r_watchdog similar to A64.
Declare it in the device-tree.
--- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +8 -0
@@ -632,6 +632,14 @@ #reset-cells = <1>; }; + r_watchdog: watchdog@7020400 { + compatible = "allwinner,sun50i-h6-wdt", + "allwinner,sun50i-a64-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x07020400 0x20>; + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; + }; + r_intc: interrupt-controller@7021000 { compatible = "allwinner,sun50i-h6-r-intc", "allwinner,sun6i-a31-r-intc";
Signature · 1 line
2.17.1
Re: [PATCH v3 3/4] arm64: dts: allwinner: h6: add r_watchog node
Hi Maxime,
Quoted 15 lines · Clément Péron
Allwinner H6 has a
r_watchdogsimilar to A64.Declare it in the device-tree.
Signed-off-by Clément Péron <[email protected]>--- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +0
-0
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi line 640
Quoted 9 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +6
-0@@ -632,6 +632,14 @@ #reset-cells = <1>; }; + r_watchdog: watchdog@7020400 { + compatible = "allwinner,sun50i-h6-wdt", + "allwinner,sun50i-a64-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x07020400 0x20>; + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
Just want to point out that i have used the same bindings for WDT and R_WDT. I think it would be better to also introduce a bindings like "allwinner,sun50i-h6-r-wdt", "allwinner,sun6i-a31-wdt";
We don't have access to the datasheet of this IP but we can strongly suppose that wdt and r-wdt are the same.
What do you think?
Regards,
Clement
Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +2
-1+ }; + r_intc: interrupt-controller@7021000 { compatible = "allwinner,sun50i-h6-r-intc", "allwinner,sun6i-a31-r-intc"; --2.17.1
PATCH v3 4/4 arm64: defconfig: enable sunxi watchdog
In reply to Clément PéronThe SUNXI_WATCHDOG option is required to make the
watchdog available on Allwinner H6.
Enable this option as a module.
--- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
@@ -420,6 +420,7 @@ CONFIG_UNIPHIER_THERMAL=y CONFIG_WATCHDOG=y CONFIG_ARM_SP805_WATCHDOG=y CONFIG_S3C2410_WATCHDOG=y +CONFIG_SUNXI_WATCHDOG=m CONFIG_IMX2_WDT=y CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_WATCHDOG=m
Signature · 1 line
2.17.1