mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v2] watchdog: permit `wd 0` for non-stoppable, but inactive, watchdogs
Date: Tue, 23 Jun 2020 10:18:22 +0200	[thread overview]
Message-ID: <20200623081822.GV11869@pengutronix.de> (raw)
In-Reply-To: <20200622151115.29012-1-a.fatoum@pengutronix.de>

On Mon, Jun 22, 2020 at 05:11:15PM +0200, Ahmad Fatoum wrote:
> A watchdog that can't be stopped returns -ENOSYS on set_timeout(0).
> If the watchdog supports communicating whether it's running, we could
> still allow `wd 0`, if it hasn't been started yet.
> 
> Setting device parameter .priority=0 disables a watchdog. One would
> expect this to always succeed for a not-running watchdog, but currently
> it doesn't, if the driver's set_timeout(0) returns -ENOSYS. With this
> fix, this is supported making the user API less surprising.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---

Applied, thanks

Sascha

> v1 -> v2:
>   - use watchdog_hw_running helper
> ---
>  drivers/watchdog/wd_core.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c
> index 34040408f716..72ada91dbf71 100644
> --- a/drivers/watchdog/wd_core.c
> +++ b/drivers/watchdog/wd_core.c
> @@ -45,6 +45,9 @@ 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);
> -- 
> 2.27.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

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

      reply	other threads:[~2020-06-23  8:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-22 15:11 Ahmad Fatoum
2020-06-23  8:18 ` 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=20200623081822.GV11869@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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