Skip to contentSkip to conversation

watchdog: rzn1: Add support for direct hardware reset

PATCH In review Herve Codina (Schneider Electric) 2 participants 3 messages Mar 24 – Mar 25

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

v3 cover watchdog: rzn1: Add support for direct hardware reset

Hi,

The current watchdog driver handling wachdogs of the RZ/N1 SoCs is based on interrupt only to perform the reset. On the watchdog timeout, an interrupt is triggered and the software initiates the reset.

The watchdogs available in the RZ/N1 SoCs can directly perform an hardware reset using their dedicated reset line.

On timeout, the watchdog also asserts its dedicated reset line. This reset line is connected to the reset controller (part of sysctrl) and, if this line is enabled as a possible reset source at the reset controller level, it initiates a system reset.

This series adds support for this feature allowing watchdogs to directly reset the system without any software needs when a watchdog timeout occurs.

Compare to previous iteration, in this v3 series patches 1 and 2 have been removed (sent in a dedicated series) and a swap in OR-ed value lines has been done.

Best regards,
Hervé

Changes v2 -> v3
v2: https://lore.kernel.org/all/[email protected]/

Patches 1 and 2 in v2 removed
Those patches have been sent in a dedicated series.
https://lore.kernel.org/all/[email protected]/

Patch 1 (patch 3 in v2)
Swap OR-ed value lines in order to have MRESET_EN at the end. Add 'Reviewed-by: Wolfram Sang'
Add 'Tested-by: Wolfram Sang'

Changes v1 -> v2:
v1: https://lore.kernel.org/lkml/[email protected]/

Patch 1 and 2:
No changes

Patch 3 (new in v2):
Unconditionally enable watchdog reset sources

Patch 3, 4 and 5 in v1:
Removed

Herve Codina (Schneider Electric) (1):
clk: renesas: r9a06g032: Enable watchdog reset sources

 drivers/clk/renesas/r9a06g032-clocks.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.53.0
#1 lore raw

PATCH v3 1/1 clk: renesas: r9a06g032: Enable watchdog reset sources

The watchdog timeout is signaled using an interrupt and, on this interrupt, a software initiated reset is performed.

This software initiated reset performs, in the end, a hardware system reset using SWRST_REQ of RSTCTRL register.

The watchdog itself is able to control directly the hardware system reset without any operation done by the interrupt handler. This feature allows the watchdog to not depend on the software to reset the system when a watchdog timeout occurs.

Indeed, when the watchdog timeout occurs, the watchdog requests a system reset using its own hardware dedicated line but this reset source is disabled at the reset controller level.

To benefit of this feature and be robust against software issues, enable watchdogs reset sources.

---
 drivers/clk/renesas/r9a06g032-clocks.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/renesas/r9a06g032-clocks.c +3 -2
index 7407a4183a6c..2bed88e09ce6 100644
@@ -1342,8 +1342,9 @@ static int __init r9a06g032_clocks_probe(struct platform_device *pdev)
 	/* Clear potentially pending resets */
 	writel(R9A06G032_SYSCTRL_WDA7RST_0 | R9A06G032_SYSCTRL_WDA7RST_1,
 	       clocks->reg + R9A06G032_SYSCTRL_RSTCTRL);
-	/* Allow software reset */
-	writel(R9A06G032_SYSCTRL_SWRST | R9A06G032_SYSCTRL_RSTEN_MRESET_EN,
+	/* Allow watchdogs and software resets */
+	writel(R9A06G032_SYSCTRL_WDA7RST_0 | R9A06G032_SYSCTRL_WDA7RST_1 |
+	       R9A06G032_SYSCTRL_SWRST | R9A06G032_SYSCTRL_RSTEN_MRESET_EN,
 	       clocks->reg + R9A06G032_SYSCTRL_RSTEN);
 
 	error = devm_register_sys_off_handler(dev, SYS_OFF_MODE_RESTART, SYS_OFF_PRIO_HIGH,
Signature · 1 line
2.53.0
Reviewed-by on v3 1/1
#2 lore raw

Re: [PATCH v3 1/1] clk: renesas: r9a06g032: Enable watchdog reset sources

Quoted 15 lines · Herve Codina (Schneider Electric)

The watchdog timeout is signaled using an interrupt and, on this interrupt, a software initiated reset is performed.

This software initiated reset performs, in the end, a hardware system reset using SWRST_REQ of RSTCTRL register.

The watchdog itself is able to control directly the hardware system reset without any operation done by the interrupt handler. This feature allows the watchdog to not depend on the software to reset the system when a watchdog timeout occurs.

Indeed, when the watchdog timeout occurs, the watchdog requests a system reset using its own hardware dedicated line but this reset source is disabled at the reset controller level.

Quoted 7 lines

To benefit of this feature and be robust against software issues, enable watchdogs reset sources.

i.e. will queue in renesas-clk for v7.1.

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds