From: Sascha Hauer <s.hauer@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org, Bastian Krause <bst@pengutronix.de>
Subject: Re: [PATCH] watchdog: fix watchdog_set_timeout breakage for drivers like imxwd
Date: Wed, 19 Aug 2020 09:38:08 +0200 [thread overview]
Message-ID: <20200819073808.GS13023@pengutronix.de> (raw)
In-Reply-To: <20200818131816.7700-1-a.fatoum@pengutronix.de>
On Tue, Aug 18, 2020 at 03:18:16PM +0200, Ahmad Fatoum wrote:
> Commit 0b944fce55f4 ("watchdog: permit `wd 0` for non-stoppable, but
> inactive, watchdogs") silently broke use of non-stoppable, but inactive,
> watchdogs altogether. Because those always had watchdog_hw_running
> evaluating to false, it early exited without a chance to ever actually
> set the timeout (and for watchdog_hw_running to evaluate to != false).
>
> This results in following watchdog drivers being broken in v2020.08.0:
>
> - imxwd
> - f71808e_wdt
> - at91sam9_wdt
>
> Fixes: 0b944fce55f4 ("watchdog: permit `wd 0` for non-stoppable, but inactive, watchdogs")
> Reported-by: Bastian Krause <bst@pengutronix.de>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> Please apply to master (and to v2020.08.1?).
> ---
> drivers/watchdog/wd_core.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c
> index ab1dcaa40a3a..4247288dbd0a 100644
> --- a/drivers/watchdog/wd_core.c
> +++ b/drivers/watchdog/wd_core.c
> @@ -45,12 +45,11 @@ int watchdog_set_timeout(struct watchdog *wd, unsigned timeout)
> if (timeout > wd->timeout_max)
> return -EINVAL;
>
> - if (watchdog_hw_running(wd) == false)
> - return 0;
> -
> pr_debug("setting timeout on %s to %ds\n", watchdog_name(wd), timeout);
>
> ret = wd->set_timeout(wd, timeout);
> + if (ret == -ENOSYS && watchdog_hw_running(wd) == false)
Instead of testing for a specific error code from set_timeout(), can't
we just do a
if (!timeout && !watchdog_hw_running(wd))
return 0;
This would make the intention of the code more clear.
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2020-08-19 7:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 13:18 Ahmad Fatoum
2020-08-19 6:59 ` Sascha Hauer
2020-08-19 7:18 ` Ahmad Fatoum
2020-08-19 7:33 ` Sascha Hauer
2020-08-19 7:38 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200819073808.GS13023@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=bst@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox