[v2][PATCH] watchdog: core: stop watchdog when executing poweroff command

[v2][PATCH] watchdog: core: stop watchdog when executing poweroff command

[Meng Li]

From: Meng Li <meng.li@windriver.com>

On some platforms, for example, Intel SoC FPGA platform, the watchdog
is started in u-boot, and so kernel will create a timer and work to
keep watchdog alive. But when user executes commands "poweroff" or
"shutdown -h", the system is reset when watchdog triggers timeout even
if WDOG_STOP_ON_REBOOT is set in watchdog driver. The root cause is
that the watchdog is not stopped properly because the SYS_POWER_OFF case
is not supported in notify callback function. So, add this case to stop
watchdog when executing poweroff command.

Signed-off-by: Meng Li <Meng.Li@windriver.com>
---

v2:
 - fix typos in commit log

---
 drivers/watchdog/watchdog_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index d4c5a736fdcb..5b55ccae06d4 100644
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -161,7 +161,7 @@ static int watchdog_reboot_notifier(struct notifier_block *nb,
 	struct watchdog_device *wdd;
 
 	wdd = container_of(nb, struct watchdog_device, reboot_nb);
-	if (code == SYS_DOWN || code == SYS_HALT) {
+	if (code == SYS_DOWN || code == SYS_HALT || code == SYS_POWER_OFF) {
 		if (watchdog_hw_running(wdd)) {
 			int ret;
 
-- 
2.17.1

Re: [v2][PATCH] watchdog: core: stop watchdog when executing poweroff command

[Guenter Roeck]

On Mon, Aug 14, 2023 at 05:06:16PM +0800, Meng Li wrote:
> From: Meng Li <meng.li@windriver.com>
> 
> On some platforms, for example, Intel SoC FPGA platform, the watchdog
> is started in u-boot, and so kernel will create a timer and work to
> keep watchdog alive. But when user executes commands "poweroff" or
> "shutdown -h", the system is reset when watchdog triggers timeout even
> if WDOG_STOP_ON_REBOOT is set in watchdog driver. The root cause is
> that the watchdog is not stopped properly because the SYS_POWER_OFF case
> is not supported in notify callback function. So, add this case to stop
> watchdog when executing poweroff command.
> 
> Signed-off-by: Meng Li <Meng.Li@windriver.com>

Makes sense.

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

Guenter

> ---
> 
> v2:
>  - fix typos in commit log
> 
> ---
>  drivers/watchdog/watchdog_core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
> index d4c5a736fdcb..5b55ccae06d4 100644
> --- a/drivers/watchdog/watchdog_core.c
> +++ b/drivers/watchdog/watchdog_core.c
> @@ -161,7 +161,7 @@ static int watchdog_reboot_notifier(struct notifier_block *nb,
>  	struct watchdog_device *wdd;
>  
>  	wdd = container_of(nb, struct watchdog_device, reboot_nb);
> -	if (code == SYS_DOWN || code == SYS_HALT) {
> +	if (code == SYS_DOWN || code == SYS_HALT || code == SYS_POWER_OFF) {
>  		if (watchdog_hw_running(wdd)) {
>  			int ret;
>  
> -- 
> 2.17.1
>