Re: [PATCH v3] watchdog: sunxi_wdt: stop the watchdog across system suspend
From: Guenter Roeck
Date: Tue Nov 17 2026 - 19:28:16 EST
On 11/17/26 15:18, Yang Siyuan wrote:
The H616 watchdog has a maximum timeout of 16 seconds. systemd keeps
/dev/watchdog0 open with RuntimeWatchdogSec=16s, but during system
suspend all userspace is frozen and the watchdog core does not stop the
hardware. A suspend longer than the timeout therefore resets the board
before it can resume.
Add system sleep PM ops to stop the watchdog before suspend and restart
it after resume if it was running. The driver did not store its private
data in the platform device, so add platform_set_drvdata() for the PM
callbacks.
Use DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr(), and use
watchdog_hw_running() instead of a private flag to decide whether the
hardware needs to be stopped and restarted.
Tested on an Anbernic RG35XX-SP: a 30-second s2idle suspend resumes
without the 16-second watchdog reset, and /dev/watchdog0 keeps working
afterwards.
Signed-off-by: Yang Siyuan <hsyysy@xxxxxxx>
---
Changes in v3:
- Mark the PM callbacks __maybe_unused. With CONFIG_PM_SLEEP=n the
pm_sleep_ptr() references expand to NULL, so both callbacks were unused
and a W=1 build warned about them. Reported by the kernel test robot:
https://lore.kernel.org/oe-kbuild-all/202611172344.RbQl66xu-lkp@xxxxxxxxx/
That build report was for v1 of the patch. __maybe_unused is unnecessary
with DEFINE_SIMPLE_DEV_PM_OPS.
Guenter