Linux Watchdog driver development
 help / color / mirror / Atom feed
* [PATCH] watchdog: sp805_wdt: re-enable the clock in the restart handler
@ 2026-11-20 20:10 David Yang
  2026-11-20 20:19 ` sashiko-bot
  0 siblings, 1 reply; 2+ messages in thread
From: David Yang @ 2026-11-20 20:10 UTC (permalink / raw)
  To: linux-watchdog; +Cc: David Yang, Wim Van Sebroeck, Guenter Roeck, linux-kernel

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@smtp.kernel.org
Signed-off-by: David Yang <mmyangfl@gmail.com>
---
 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);
-- 
2.53.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] watchdog: sp805_wdt: re-enable the clock in the restart handler
  2026-11-20 20:10 [PATCH] watchdog: sp805_wdt: re-enable the clock in the restart handler David Yang
@ 2026-11-20 20:19 ` sashiko-bot
  0 siblings, 0 replies; 2+ messages in thread
From: sashiko-bot @ 2026-11-20 20:19 UTC (permalink / raw)
  To: David Yang, linux-watchdog

Thank you for your contribution! Sashiko AI review found 2 potential
issues to consider:
- [High] watchdog: sp805_wdt: sleeping clk_prepare_enable() call in
  wdt_restart()
- [Low] watchdog: sp805_wdt: missing Fixes trailer for wdt_restart()
  clock fix
--

commit 800a9ee3ac4d2d74f9b4e848c39474209c8cef7f
Author: David Yang <mmyangfl@gmail.com>

> watchdog: sp805_wdt: re-enable the clock in the restart handler
>
> 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@smtp.kernel.org
> Signed-off-by: David Yang <mmyangfl@gmail.com>

[Severity: Low]
Should this bug fix include a Fixes tag for the commit that introduced
wdt_restart()?

  Fixes: 6c5c0d48b686 ("watchdog: sp805: add restart handler")

> diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
> index a14ff7ac0db48..20b2fbb7334db 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);

[Severity: High]
Can wdt_restart() call clk_prepare_enable()?

do_kernel_restart() invokes restart handlers via
atomic_notifier_call_chain(&restart_handler_list, ...) under
rcu_read_lock() with local interrupts disabled, whereas clk_prepare()
acquires the sleeping prepare_lock mutex and calls ->prepare() callbacks.
When wdt->clk is unprepared (either because the watchdog was never started
or because wdt_disable() called clk_disable_unprepare()), this sleeps in
atomic context and can deadlock or hang system reboot.

Unlike sp805_wdt, npcm_wdt prepares its clock at probe time via
devm_clk_get_optional_prepared() and uses clk_enable() / clk_disable() at
runtime so that npcm_wdt_restart() only calls atomic-safe clk_enable().

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261120201029.1685193-1-mmyangfl@gmail.com?part=1

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-20 20:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-20 20:10 [PATCH] watchdog: sp805_wdt: re-enable the clock in the restart handler David Yang
2026-11-20 20:19 ` sashiko-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox