Skip to contentSkip to conversation

driver: watchdog: reset watchdog in designware_wdt_stop() function

PATCH Superseded Meng.Li at windriver.com 2 participants 3 messages Apr 30, 2021 Watchdog device drivers

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 driver: watchdog: reset watchdog in designware_wdt_stop() function

From: MengLi <[email protected]>

In uboot command line environment, watchdog is not able to be stopped with below commands:
SOCFPGA_STRATIX10 # wdt dev watchdog at ffd00200 SOCFPGA_STRATIX10 # wdt stop
Refer to watchdog driver in linux kernel, it is also need to reset watchdog after disable it so that the disable action takes effect.

---
v3:
Add the resets to designware_wdt_priv and initialize it in probe(). v2:
Change "#if CONFIG_IS_ENABLED(DM_RESET)" into
"if (CONFIG_IS_ENABLED(DM_RESET)) {", and define the variable into if condition sentence.

---
 drivers/watchdog/designware_wdt.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)
drivers/watchdog/designware_wdt.c +21 -10
index 12f09a7a39..cdf6b5709b 100644
@@ -23,6 +23,7 @@
 struct designware_wdt_priv {
 	void __iomem	*base;
 	unsigned int	clk_khz;
+	struct reset_ctl_bulk *resets;
 };
 
 /*
@@ -96,6 +97,18 @@ static int designware_wdt_stop(struct udevice *dev)
 	designware_wdt_reset(dev);
 	writel(0, priv->base + DW_WDT_CR);
 
+        if (CONFIG_IS_ENABLED(DM_RESET)) {
+		int ret;
+
+		ret = reset_assert_bulk(priv->resets);
+		if (ret)
+			return ret;
+
+		ret = reset_deassert_bulk(priv->resets);
+		if (ret)
+			return ret;
+	}
+
 	return 0;
 }
 
@@ -137,17 +150,15 @@ static int designware_wdt_probe(struct udevice *dev)
 	priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ;
 #endif
 
-#if CONFIG_IS_ENABLED(DM_RESET)
-	struct reset_ctl_bulk resets;
+	if (CONFIG_IS_ENABLED(DM_RESET)) {
+		ret = reset_get_bulk(dev, priv->resets);
+		if (ret)
+			return ret;
 
-	ret = reset_get_bulk(dev, &resets);
-	if (ret)
-		return ret;
-
-	ret = reset_deassert_bulk(&resets);
-	if (ret)
-		return ret;
-#endif
+		ret = reset_deassert_bulk(priv->resets);
+		if (ret)
+			return ret;
+	}
 
 	/* reset to disable the watchdog */
 	return designware_wdt_stop(dev);
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 2/2 driver: watchdog: enable wdt command by default

From: MengLi <[email protected]>

In latest u-boot code, watchdog feature is implemented, so enable wdt command by default.

---
 configs/socfpga_stratix10_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/socfpga_stratix10_defconfig +1 -0
index 02d4ac0dae..0256afe511 100644
@@ -40,6 +40,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_CMD_WDT=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Signature · 1 line
2.17.1
#2 lore raw

PATCH v3 1/2 driver: watchdog: reset watchdog in designware_wdt_stop() function

In reply to Meng.Li at windriver.com
Quoted 9 lines · Meng.Li at windriver.com

From: MengLi <[email protected]>

In uboot command line environment, watchdog is not able to be stopped with below commands:
SOCFPGA_STRATIX10 # wdt dev watchdog at ffd00200 SOCFPGA_STRATIX10 # wdt stop
Refer to watchdog driver in linux kernel, it is also need to reset watchdog after disable it so that the disable action takes effect.

Quoted 3 lines

I did not review your previous version. Please do not add a "Reviewed-by" tag for people who did not send you one.

Quoted 60 lines

---
v3:
Add the resets to designware_wdt_priv and initialize it in probe(). v2:
Change "#if CONFIG_IS_ENABLED(DM_RESET)" into
"if (CONFIG_IS_ENABLED(DM_RESET)) {", and define the variable into if condition sentence.

---
  drivers/watchdog/designware_wdt.c | 31 +++++++++++++++++++++----------
  1 file changed, 21 insertions(+), 10 deletions(-)
drivers/watchdog/designware_wdt.c +17 -7
index 12f09a7a39..cdf6b5709b 100644
@@ -23,6 +23,7 @@
  struct designware_wdt_priv {
  	void __iomem	*base;
  	unsigned int	clk_khz;
+	struct reset_ctl_bulk *resets;
  };
 
  /*
@@ -96,6 +97,18 @@ static int designware_wdt_stop(struct udevice *dev)
  	designware_wdt_reset(dev);
  	writel(0, priv->base + DW_WDT_CR);
 
+        if (CONFIG_IS_ENABLED(DM_RESET)) {
+		int ret;
+
+		ret = reset_assert_bulk(priv->resets);
+		if (ret)
+			return ret;
+
+		ret = reset_deassert_bulk(priv->resets);
+		if (ret)
+			return ret;
+	}
+
  	return 0;
  }
 
@@ -137,17 +150,15 @@ static int designware_wdt_probe(struct udevice *dev)
  	priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ;
  #endif
 
-#if CONFIG_IS_ENABLED(DM_RESET)
-	struct reset_ctl_bulk resets;
+	if (CONFIG_IS_ENABLED(DM_RESET)) {
+		ret = reset_get_bulk(dev, priv->resets);
+		if (ret)
+			return ret;
 
-	ret = reset_get_bulk(dev, &resets);
-	if (ret)
-		return ret;
-
-	ret = reset_deassert_bulk(&resets);

drivers/watchdog/designware_wdt.c static int designware_wdt_probe(struct udevice *dev) · line 164

Quoted 10 lines
drivers/watchdog/designware_wdt.c +4 -3
-	if (ret)
-		return ret;
-#endif
+		ret = reset_deassert_bulk(priv->resets);
+		if (ret)
+			return ret;
+	}
 
  	/* reset to disable the watchdog */
  	return designware_wdt_stop(dev);

However, this version LGTM.