Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
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
Message-Id: <20200326150203.371673-1-s.riedmueller@phytec.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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=5Fwdt.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/watchdog/da9062=5Fwdt.c b/drivers/watchdog/da9062=5Fwd=
t.c
index 0ad15d55071c..6d81b1276b87 100644
--- a/drivers/watchdog/da9062=5Fwdt.c
+++ b/drivers/watchdog/da9062=5Fwdt.c
@@ -35,6 +35,14 @@ struct da9062=5Fwatchdog {
 	bool use=5Fsw=5Fpm;
 };
=20
+static unsigned int da9062=5Fwdt=5Fread=5Ftimeout(struct da9062=5Fwatchdog=
 *wdt)
+{
+	int val;
+
+	regmap=5Fread(wdt->hw->regmap, DA9062AA=5FCONTROL=5FD, &val);
+	return wdt=5Ftimeout[val & DA9062AA=5FTWDSCALE=5FMASK];
+}
+
 static unsigned int da9062=5Fwdt=5Ftimeout=5Fto=5Fsel(unsigned int secs)
 {
 	unsigned int i;
@@ -184,6 +192,7 @@ static int da9062=5Fwdt=5Fprobe(struct platform=5Fdevic=
e *pdev)
 {
 	struct device *dev =3D &pdev->dev;
 	int ret;
+	int timeout;
 	struct da9062 *chip;
 	struct da9062=5Fwatchdog *wdt;
=20
@@ -213,6 +222,13 @@ static int da9062=5Fwdt=5Fprobe(struct platform=5Fdevi=
ce *pdev)
 	watchdog=5Fset=5Fdrvdata(&wdt->wdtdev, wdt);
 	dev=5Fset=5Fdrvdata(dev, &wdt->wdtdev);
=20
+	timeout =3D da9062=5Fwdt=5Fread=5Ftimeout(wdt);
+	if (timeout > 0) {
+		wdt->wdtdev.timeout =3D timeout;
+		set=5Fbit(WDOG=5FHW=5FRUNNING, &wdt->wdtdev.status);
+		dev=5Finfo(wdt->hw->dev, "watchdog is running (%u s)", timeout);
+	}
+
 	ret =3D devm=5Fwatchdog=5Fregister=5Fdevice(dev, &wdt->wdtdev);
 	if (ret < 0)
 		return ret;
--=20
2.23.0