From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jnO8X-0002OP-DO for barebox@lists.infradead.org; Mon, 22 Jun 2020 15:13:32 +0000 From: Ahmad Fatoum Date: Mon, 22 Jun 2020 17:11:15 +0200 Message-Id: <20200622151115.29012-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH v2] watchdog: permit `wd 0` for non-stoppable, but inactive, watchdogs To: barebox@lists.infradead.org Cc: Ahmad Fatoum 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 --- 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