Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Sender: Guenter Roeck <groeck7@gmail.com>
Message-ID: <5a6cb162-790a-d24a-8946-090f4a893cf7@roeck-us.net>
Date:   Thu, 29 Jun 2023 22:44:37 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.0
Subject: Re: [PATCH] watchdog: core: stop watchdog when executing poweroff
 command
Content-Language: en-US
To:     Meng Li <Meng.Li@windriver.com>, wim@linux-watchdog.org,
        linux-watchdog@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org
References: <20230630053912.28205-1-Meng.Li@windriver.com>
From:   Guenter Roeck <linux@roeck-us.net>
In-Reply-To: <20230630053912.28205-1-Meng.Li@windriver.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 6/29/23 22:39, Meng Li wrote:
> From: Meng Li <meng.li@windriver.com>
> 
> On some platforms, for example, Intel SoC FPGA platform, the watchdog is
> started in from 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 not stopped properly because the SYS_POWER_OFF case
> is not supported in nofify callback function. So, add this case to stop
> watchdog when executing poweroff command.
> 
> Signed-off-by: Meng Li <Meng.Li@windriver.com>

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

> ---
>   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;
>