Re: [PATCH] watchdog: sp805_wdt: re-enable the clock in the restart handler
From: Guenter Roeck
Date: Fri Nov 20 2026 - 18:13:53 EST
On 11/20/26 12:10, David Yang wrote:
wdt_restart() fail to reboot the system if the watchdog counter clock
was previously disabled: If userspace cleanly stops the watchdog, the
core calls wdt_disable() which disables wdt->clk. No reset comes.
Re-enable the clock in it as in npcm_wdt.
Link: https://lore.kernel.org/r/20260911031916.A8E051F000FF@xxxxxxxxxxxxxxx
Signed-off-by: David Yang <mmyangfl@xxxxxxxxx>
---
drivers/watchdog/sp805_wdt.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index a14ff7ac0db4..20b2fbb7334d 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -138,6 +138,9 @@ wdt_restart(struct watchdog_device *wdd, unsigned long mode, void *cmd)
{
struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);
+ /* For reset, we start the WDT clock and leave it running. */
+ clk_prepare_enable(wdt->clk);
+
writel_relaxed(UNLOCK, wdt->base + WDTLOCK);
writel_relaxed(0, wdt->base + WDTCONTROL);
writel_relaxed(0, wdt->base + WDTLOAD);
This probably needs a fix similar to commit 4e83ea5b2219 ("watchdog: npcm:
fix sleeping clock call in restart handler") - leave the clock prepared
all the time and only enable / disable it when starting or stopping the
watchdog.
Guenter