From: Stefan Riedmueller <s.riedmueller@phytec.de>
To: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
Support Opensource <support.opensource@diasemi.com>
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/3] watchdog: da9062: Use pre-configured timeout until userspace takes over
Date: Thu, 26 Mar 2020 16:02:01 +0100 [thread overview]
Message-ID: <20200326150203.371673-1-s.riedmueller@phytec.de> (raw)
If the watchdog is already running during probe read back its
pre-configured timeout (set e.g. by the bootloader) and use it to ping
the watchdog until userspace takes over. Otherwise the default timeout
set before might not result in a fast enough ping.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
drivers/watchdog/da9062_wdt.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c
index 0ad15d55071c..6d81b1276b87 100644
--- a/drivers/watchdog/da9062_wdt.c
+++ b/drivers/watchdog/da9062_wdt.c
@@ -35,6 +35,14 @@ struct da9062_watchdog {
bool use_sw_pm;
};
+static unsigned int da9062_wdt_read_timeout(struct da9062_watchdog *wdt)
+{
+ int val;
+
+ regmap_read(wdt->hw->regmap, DA9062AA_CONTROL_D, &val);
+ return wdt_timeout[val & DA9062AA_TWDSCALE_MASK];
+}
+
static unsigned int da9062_wdt_timeout_to_sel(unsigned int secs)
{
unsigned int i;
@@ -184,6 +192,7 @@ static int da9062_wdt_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
int ret;
+ int timeout;
struct da9062 *chip;
struct da9062_watchdog *wdt;
@@ -213,6 +222,13 @@ static int da9062_wdt_probe(struct platform_device *pdev)
watchdog_set_drvdata(&wdt->wdtdev, wdt);
dev_set_drvdata(dev, &wdt->wdtdev);
+ timeout = da9062_wdt_read_timeout(wdt);
+ if (timeout > 0) {
+ wdt->wdtdev.timeout = timeout;
+ set_bit(WDOG_HW_RUNNING, &wdt->wdtdev.status);
+ dev_info(wdt->hw->dev, "watchdog is running (%u s)", timeout);
+ }
+
ret = devm_watchdog_register_device(dev, &wdt->wdtdev);
if (ret < 0)
return ret;
--
2.23.0
next reply other threads:[~2020-03-26 15:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 15:02 Stefan Riedmueller [this message]
2020-03-26 15:02 ` [PATCH 2/3] watchdog: da9063: Use pre configured timeout when watchdog is running Stefan Riedmueller
2020-03-30 16:38 ` Adam Thomson
2020-03-31 16:08 ` Guenter Roeck
2020-04-01 8:19 ` Stefan Riedmüller
2020-03-26 15:02 ` [PATCH 3/3] watchdog: da9062: No need to ping manually before setting timeout Stefan Riedmueller
2020-03-31 16:11 ` Guenter Roeck
2020-04-01 10:20 ` Adam Thomson
2020-03-31 16:00 ` [PATCH 1/3] watchdog: da9062: Use pre-configured timeout until userspace takes over Guenter Roeck
2020-03-31 16:04 ` 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=20200326150203.371673-1-s.riedmueller@phytec.de \
--to=s.riedmueller@phytec.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=support.opensource@diasemi.com \
--cc=wim@linux-watchdog.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;
as well as URLs for NNTP newsgroup(s).