Skip to contentSkip to conversation

watchdog: make DesignWare watchdog allow users to set bigger timeout value

PATCH Superseded Wang, Peng 1. (NSB - CN/Hangzhou) 2 participants 2 messages Nov 21, 2019 Watchdog device drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 watchdog: make DesignWare watchdog allow users to set bigger timeout value

From d21d084122d08816454a1e338f0946a9da1f81e3 Mon Sep 17 00:00:00 2001
From: Peng Wang <[email protected]>
Date: Wed, 20 Nov 2019 15:12:59 +0800
Subject: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger
timeout value

watchdog_dev.c provides means to allow users to set bigger timeout value than HW can support, make DesignWare watchdog align with this.

---
 drivers/watchdog/dw_wdt.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/watchdog/dw_wdt.c +9 -1
index fef7c61..f1a431c 100644
@@ -114,7 +114,15 @@ static int dw_wdt_set_timeout(struct watchdog_device *wdd, unsigned int top_s)
 	writel(top_val | top_val << WDOG_TIMEOUT_RANGE_TOPINIT_SHIFT,
 	       dw_wdt->regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);
 
-	wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+	/*
+	 * In case users set bigger timeout value than HW can support,
+	 * kernel(watchdog_dev.c) helps to feed watchdog before 
+	 * wdd->timeout
+	 */
+	if ( top_s * 1000 <= wdd->max_hw_heartbeat_ms )
+		wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+	else
+		wdd->timeout = top_s;
 
 	return 0;
 }
Signature · 1 line
1.8.3.1
maintainer
#1 lore raw
Quoted 11 lines · On 11/21/19 12:21 AM, Wang, Peng 1. (NSB - CN/Hangzhou) wrote:
Quoted 1 line

From d21d084122d08816454a1e338f0946a9da1f81e3 Mon Sep 17 00:00:00 2001

From: Peng Wang <[email protected]>
Date: Wed, 20 Nov 2019 15:12:59 +0800
Subject: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger
timeout value

watchdog_dev.c provides means to allow users to set bigger timeout value than HW can support, make DesignWare watchdog align with this.

---

Please version your patches, and add a change log here.

Quoted 8 lines
  drivers/watchdog/dw_wdt.c | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
drivers/watchdog/dw_wdt.c +0 -0
index fef7c61..f1a431c 100644

drivers/watchdog/dw_wdt.c static int dw_wdt_set_timeout(struct watchdog_device *wdd, unsigned int top_s) · line 120

Quoted 8 lines
drivers/watchdog/dw_wdt.c +4 -1
@@ -114,7 +114,15 @@ static int dw_wdt_set_timeout(struct watchdog_device *wdd, unsigned int top_s)
  	writel(top_val | top_val << WDOG_TIMEOUT_RANGE_TOPINIT_SHIFT,
  	       dw_wdt->regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);
 
-	wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+	/*
+	 * In case users set bigger timeout value than HW can support,
+	 * kernel(watchdog_dev.c) helps to feed watchdog before
+	 * wdd->timeout

No, before wdd->max_hw_heartbeat_ms.

Quoted 9 lines
drivers/watchdog/dw_wdt.c +5 -0
+	 */
+	if ( top_s * 1000 <= wdd->max_hw_heartbeat_ms )
+		wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+	else
+		wdd->timeout = top_s;
 
  	return 0;
  }