All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
To: u-boot@lists.denx.de
Cc: Stefan Roese <sr@denx.de>, Tom Rini <trini@konsulko.com>,
	Simon Glass <sjg@chromium.org>,
	Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Subject: [PATCH v2 05/10] watchdog: wdt-uclass.c: keep track of each device's running state
Date: Fri, 28 May 2021 00:00:12 +0200	[thread overview]
Message-ID: <20210527220017.1266765-6-rasmus.villemoes@prevas.dk> (raw)
In-Reply-To: <20210527220017.1266765-1-rasmus.villemoes@prevas.dk>

As a step towards handling all DM watchdogs in watchdog_reset(), use a
per-device flag to keep track of whether the device has been started
instead of a bit in gd->flags.

We will still need that bit to know whether we are past
initr_watchdog() and hence have populated gd->watchdog_dev -
incidentally, that is how it was used prior to commit 9c44ff1c5f3c.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
---
 drivers/watchdog/wdt-uclass.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index 5d5dbcd0f7..026b6d1eb4 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -22,6 +22,7 @@ struct wdt_priv {
 	u32 timeout;
 	ulong reset_period;
 	ulong next_reset;
+	bool running;
 };
 
 static void init_watchdog_dev(struct udevice *dev)
@@ -63,6 +64,7 @@ int initr_watchdog(void)
 	}
 	init_watchdog_dev(gd->watchdog_dev);
 
+	gd->flags |= GD_FLG_WDT_READY;
 	return 0;
 }
 
@@ -75,8 +77,11 @@ int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags)
 		return -ENOSYS;
 
 	ret = ops->start(dev, timeout_ms, flags);
-	if (ret == 0)
-		gd->flags |= GD_FLG_WDT_READY;
+	if (ret == 0) {
+		struct wdt_priv *priv = dev_get_uclass_priv(dev);
+
+		priv->running = true;
+	}
 
 	return ret;
 }
@@ -90,8 +95,11 @@ int wdt_stop(struct udevice *dev)
 		return -ENOSYS;
 
 	ret = ops->stop(dev);
-	if (ret == 0)
-		gd->flags &= ~GD_FLG_WDT_READY;
+	if (ret == 0) {
+		struct wdt_priv *priv = dev_get_uclass_priv(dev);
+
+		priv->running = false;
+	}
 
 	return ret;
 }
@@ -145,6 +153,9 @@ void watchdog_reset(void)
 
 	dev = gd->watchdog_dev;
 	priv = dev_get_uclass_priv(dev);
+	if (!priv->running)
+		return;
+
 	/* Do not reset the watchdog too often */
 	now = get_timer(0);
 	if (time_after_eq(now, priv->next_reset)) {
-- 
2.31.1


  parent reply	other threads:[~2021-05-27 22:01 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-27 22:00 [PATCH v2 00/10] handling all DM watchdogs in watchdog_reset() Rasmus Villemoes
2021-05-27 22:00 ` [PATCH v2 01/10] watchdog: wdt-uclass.c: use wdt_start() in wdt_expire_now() Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  5:54   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 02/10] watchdog: wdt-uclass.c: introduce struct wdt_priv Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  5:56   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 03/10] watchdog: wdt-uclass.c: neaten UCLASS_DRIVER definition Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  5:57   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 04/10] watchdog: wdt-uclass.c: refactor initr_watchdog() Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  5:59   ` Stefan Roese
2021-05-27 22:00 ` Rasmus Villemoes [this message]
2021-06-22 13:31   ` [PATCH v2 05/10] watchdog: wdt-uclass.c: keep track of each device's running state Simon Glass
2021-06-29  6:04   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 06/10] sandbox: disable CONFIG_WATCHDOG_AUTOSTART Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  6:05   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 07/10] watchdog: wdt-uclass.c: handle all DM watchdogs in watchdog_reset() Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-22 20:28     ` Rasmus Villemoes
2021-06-23  5:53       ` Stefan Roese
2021-06-26 18:32       ` Simon Glass
2021-06-28  7:44         ` Rasmus Villemoes
2021-06-29  6:11           ` Stefan Roese
2021-07-05 15:29           ` Simon Glass
2021-05-27 22:00 ` [PATCH v2 08/10] watchdog: add gpio watchdog driver Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  6:07   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 09/10] sandbox: add test of wdt_gpio driver Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  6:08   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 10/10] sandbox: add test of wdt-uclass' watchdog_reset() Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-22 20:29     ` Rasmus Villemoes
2021-06-26 18:32       ` Simon Glass
2021-06-29  6:08   ` Stefan Roese
2021-06-08 22:41 ` [PATCH v2 00/10] handling all DM watchdogs in watchdog_reset() Rasmus Villemoes
2021-06-10  5:28   ` Stefan Roese

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=20210527220017.1266765-6-rasmus.villemoes@prevas.dk \
    --to=rasmus.villemoes@prevas.dk \
    --cc=sjg@chromium.org \
    --cc=sr@denx.de \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.