From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-watchdog@vger.kernel.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
Chris Healy <cphealy@gmail.com>,
Guenter Roeck <linux@roeck-us.net>,
Rick Ramstetter <rick@anteaterllc.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] watchdog: ziirave_wdt: Don't bail out on unexpected timeout value
Date: Wed, 31 Jul 2019 10:42:51 -0700 [thread overview]
Message-ID: <20190731174252.18041-5-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190731174252.18041-1-andrew.smirnov@gmail.com>
Reprogramming bootloader on watchdog MCU will result in reported
default timeout value of "0". That in turn will be unnecesarily
rejected by the driver as invalid device (-ENODEV). Simplify probe to
just read stored timeout value, clamp it to an acceptable range and
program the value unconditionally to fix the above.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Rick Ramstetter <rick@anteaterllc.com>
Cc: linux-watchdog@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
drivers/watchdog/ziirave_wdt.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
index 89ce6982ba53..33c8d2eadada 100644
--- a/drivers/watchdog/ziirave_wdt.c
+++ b/drivers/watchdog/ziirave_wdt.c
@@ -667,22 +667,18 @@ static int ziirave_wdt_probe(struct i2c_client *client,
return val;
}
- if (val < ZIIRAVE_TIMEOUT_MIN)
- return -ENODEV;
-
- w_priv->wdd.timeout = val;
- } else {
- ret = ziirave_wdt_set_timeout(&w_priv->wdd,
- w_priv->wdd.timeout);
- if (ret) {
- dev_err(&client->dev, "Failed to set timeout\n");
- return ret;
- }
+ w_priv->wdd.timeout = clamp(val, ZIIRAVE_TIMEOUT_MIN,
+ ZIIRAVE_TIMEOUT_MAX);
+ }
- dev_info(&client->dev, "Timeout set to %ds\n",
- w_priv->wdd.timeout);
+ ret = ziirave_wdt_set_timeout(&w_priv->wdd, w_priv->wdd.timeout);
+ if (ret) {
+ dev_err(&client->dev, "Failed to set timeout\n");
+ return ret;
}
+ dev_info(&client->dev, "Timeout set to %ds\n", w_priv->wdd.timeout);
+
watchdog_set_nowayout(&w_priv->wdd, nowayout);
i2c_set_clientdata(client, w_priv);
--
2.21.0
next prev parent reply other threads:[~2019-07-31 17:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-31 17:42 [PATCH 0/5] Ziirave_wdt driver fixes Andrey Smirnov
2019-07-31 17:42 ` [PATCH 1/5] watchdog: ziirave_wdt: Add missing newline Andrey Smirnov
2019-07-31 21:42 ` Guenter Roeck
2019-07-31 17:42 ` [PATCH 2/5] watchdog: ziirave_wdt: Be verbose about errors in probe() Andrey Smirnov
2019-07-31 21:42 ` Guenter Roeck
2019-07-31 17:42 ` [PATCH 3/5] watchdog: ziirave_wdt: Be more verbose during firmware update Andrey Smirnov
2019-07-31 21:43 ` Guenter Roeck
2019-07-31 17:42 ` Andrey Smirnov [this message]
2019-07-31 18:09 ` [PATCH 4/5] watchdog: ziirave_wdt: Don't bail out on unexpected timeout value Guenter Roeck
2019-08-10 21:17 ` Andrey Smirnov
2019-08-02 20:49 ` Guenter Roeck
2019-07-31 17:42 ` [PATCH 5/5] watchdog: ziirave_wdt: Log bootloader/firmware info during probe Andrey Smirnov
2019-07-31 21:44 ` Guenter Roeck
2019-07-31 18:11 ` [PATCH 0/5] Ziirave_wdt driver fixes Guenter Roeck
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=20190731174252.18041-5-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=cphealy@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=rick@anteaterllc.com \
/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;
as well as URLs for NNTP newsgroup(s).