Linux-Watchdog Archive on lore.kernel.org
 help / color / Atom feed
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 2/3] watchdog: da9063: Use pre configured timeout when watchdog is running
Date: Thu, 26 Mar 2020 16:02:02 +0100
Message-ID: <20200326150203.371673-2-s.riedmueller@phytec.de> (raw)
In-Reply-To: <20200326150203.371673-1-s.riedmueller@phytec.de>

If the watchdog is already running during probe use its pre-configured
timeout instead of a default timeout to make sure the watchdog is pinged
in time until userspace takes over.

Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
 drivers/watchdog/da9063_wdt.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/drivers/watchdog/da9063_wdt.c b/drivers/watchdog/da9063_wdt.c
index 3d65e92a4e3f..34d0c4f03814 100644
--- a/drivers/watchdog/da9063_wdt.c
+++ b/drivers/watchdog/da9063_wdt.c
@@ -46,15 +46,16 @@ static unsigned int da9063_wdt_timeout_to_sel(unsigned int secs)
 }
 
 /*
- * Return 0 if watchdog is disabled, else non zero.
+ * Read the currently active timeout.
+ * Zero means the watchdog is disabled.
  */
-static unsigned int da9063_wdt_is_running(struct da9063 *da9063)
+static unsigned int da9063_wdt_read_timeout(struct da9063 *da9063)
 {
 	unsigned int val;
 
 	regmap_read(da9063->regmap, DA9063_REG_CONTROL_D, &val);
 
-	return val & DA9063_TWDSCALE_MASK;
+	return wdt_timeout[val & DA9063_TWDSCALE_MASK];
 }
 
 static int da9063_wdt_disable_timer(struct da9063 *da9063)
@@ -191,6 +192,7 @@ static int da9063_wdt_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct da9063 *da9063;
 	struct watchdog_device *wdd;
+	int timeout;
 
 	if (!dev->parent)
 		return -EINVAL;
@@ -214,15 +216,20 @@ static int da9063_wdt_probe(struct platform_device *pdev)
 	watchdog_set_restart_priority(wdd, 128);
 	watchdog_set_drvdata(wdd, da9063);
 
-	/* Set default timeout, maybe override it with DT value, scale it */
-	wdd->timeout = DA9063_WDG_TIMEOUT;
-	watchdog_init_timeout(wdd, 0, dev);
-	da9063_wdt_set_timeout(wdd, wdd->timeout);
-
-	/* Change the timeout to the default value if the watchdog is running */
-	if (da9063_wdt_is_running(da9063)) {
-		da9063_wdt_update_timeout(da9063, wdd->timeout);
+	/*
+	 * Use pre-configured timeout if watchdog is already running.
+	 * Otherwise set default timeout, maybe override it with DT value,
+	 * scale it
+	 */
+	timeout = da9063_wdt_read_timeout(da9063);
+	if (timeout) {
+		wdd->timeout = timeout;
 		set_bit(WDOG_HW_RUNNING, &wdd->status);
+		dev_info(da9063->dev, "watchdog is running (%u s)", timeout);
+	} else {
+		wdd->timeout = DA9063_WDG_TIMEOUT;
+		watchdog_init_timeout(wdd, 0, dev);
+		da9063_wdt_set_timeout(wdd, wdd->timeout);
 	}
 
 	return devm_watchdog_register_device(dev, wdd);
-- 
2.23.0


  reply index

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-26 15:02 [PATCH 1/3] watchdog: da9062: Use pre-configured timeout until userspace takes over Stefan Riedmueller
2020-03-26 15:02 ` Stefan Riedmueller [this message]
2020-03-30 16:38   ` [PATCH 2/3] watchdog: da9063: Use pre configured timeout when watchdog is running 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-2-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

Linux-Watchdog Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-watchdog/0 linux-watchdog/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-watchdog linux-watchdog/ https://lore.kernel.org/linux-watchdog \
		linux-watchdog@vger.kernel.org
	public-inbox-index linux-watchdog

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-watchdog


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git