linux-kernel - Re: [PATCH] watchdog: starfive: check watchdog status before enabling in system resume

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <d967e5f3-6431-4fa0-8df8-345b8bbe9073@roeck-us.net>
Date: Mon, 29 Jan 2024 22:07:16 -0800
From: Guenter Roeck <linux@...ck-us.net>
To: Ji Sheng Teoh <jisheng.teoh@...rfivetech.com>,
 Xingyu Wu <xingyu.wu@...rfivetech.com>,
 Samin Guo <samin.guo@...rfivetech.com>,
 Wim Van Sebroeck <wim@...ux-watchdog.org>,
 Emil Renner Berthing <emil.renner.berthing@...onical.com>
Cc: Ley Foon Tan <leyfoon.tan@...rfivetech.com>,
 linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org,
 Sia Jee Heng <jeeheng.sia@...rfivetech.com>
Subject: Re: [PATCH] watchdog: starfive: check watchdog status before enabling
 in system resume

On 1/29/24 21:51, Ji Sheng Teoh wrote:
> System resume will start and enable watchdog regardless of whether the
> watchdog is enabled/disabled during a system suspend.
> Add a check to the watchdog status and only start and enable the
> watchdog if the watchdog status is running/active.
> 
> Signed-off-by: Sia Jee Heng <jeeheng.sia@...rfivetech.com>
> Signed-off-by: Ji Sheng Teoh <jisheng.teoh@...rfivetech.com>

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

> ---
>   drivers/watchdog/starfive-wdt.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
> index e28ead24c520..f72fc38a41f8 100644
> --- a/drivers/watchdog/starfive-wdt.c
> +++ b/drivers/watchdog/starfive-wdt.c
> @@ -554,7 +554,10 @@ static int starfive_wdt_resume(struct device *dev)
>   	starfive_wdt_set_reload_count(wdt, wdt->reload);
>   	starfive_wdt_lock(wdt);
>   
> -	return starfive_wdt_start(wdt);
> +	if (watchdog_active(&wdt->wdd))
> +		return starfive_wdt_start(wdt);
> +
> +	return 0;
>   }
>   
>   static int starfive_wdt_runtime_suspend(struct device *dev)