Skip to contentSkip to conversation

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

PATCH In review Wang, Peng 1. (NSB - CN/Hangzhou) 2 participants 6 messages Nov 20, 2019 – Nov 21, 2019 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

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

From 1d051b7c081083751dc0bab97d3ab9efbba0f4a7 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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/watchdog/dw_wdt.c +9 -2
index fef7c61..8911e5e 100644
@@ -113,8 +113,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 ( wdd->timeout * 1000 <= wdd->max_hw_heartbeat_ms ) {
+	    wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+    }
 
 	return 0;
 }
Signature · 1 line
1.8.3.1
maintainer
#1 lore raw
Quoted 23 lines · On Wed, Nov 20, 2019 at 10:07:57AM +0000, Wang, Peng 1. (NSB - CN/Hangzhou)…

From 1d051b7c081083751dc0bab97d3ab9efbba0f4a7 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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/watchdog/dw_wdt.c +0 -1
index fef7c61..8911e5e 100644
@@ -113,8 +113,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);
-

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

Quoted 10 lines
drivers/watchdog/dw_wdt.c +9 -1
-	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 ( wdd->timeout * 1000 <= wdd->max_hw_heartbeat_ms ) {
+	    wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+    }

{ } is unnecessary here. Also, the above code compares the _old_ timeout againt the maximum supported timeout, which doesn't look correct.

Thanks,
Guenter

Quoted 6 lines
drivers/watchdog/dw_wdt.c +0 -0
 	return 0;
 }
Signature · 1 line
1.8.3.1
#2 lore raw

Hi Guenter,

Thank you for your time.
- I will remove the unnecessary {}
- wdd->max_hw_heartbeat_ms is the max timeout value which HW can support, this value is limited according to the input clock, say. It only supports 20 seconds, if users requires to set timeout to be say. 60 seconds, the watchdog device driver 'watchdog_dev.c' checks if wdd->timeout is bigger than wdd->max_hw_heartbeat_ms, if yes, watchdog_dev.c feeds the watchdog by a worker queue itself to help to feed the watchdog before 60 seconds elapse. Here the issue of dw_wdt.c is that, the original codes update wdd->timeout to the value which HW can support, which means if users requires 60 seconds to be the timeout, then dw_wdt.c updates the timeout value to 20 seconds, this makes the "feeding helper" mechanism in watchdog_dev.c not take effect. That's why I add this check.

Thanks,
Peng Wang

-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Thursday, November 21, 2019 1:15 AM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger timeout value

Quoted 23 lines · On Wed, Nov 20, 2019 at 10:07:57AM +0000, Wang, Peng 1. (NSB - CN/Hangzhou)…

From 1d051b7c081083751dc0bab97d3ab9efbba0f4a7 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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/watchdog/dw_wdt.c +0 -1
index fef7c61..8911e5e 100644
@@ -113,8 +113,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);
-

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

Quoted 10 lines
drivers/watchdog/dw_wdt.c +9 -1
-	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 ( wdd->timeout * 1000 <= wdd->max_hw_heartbeat_ms ) {
+	    wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+    }

{ } is unnecessary here. Also, the above code compares the _old_ timeout againt the maximum supported timeout, which doesn't look correct.

Thanks,
Guenter

Quoted 6 lines
drivers/watchdog/dw_wdt.c +0 -1
 	return 0;
 }
--

1.8.3.1

maintainer
#3 lore raw
Quoted 6 lines · On 11/20/19 5:29 PM, Wang, Peng 1. (NSB - CN/Hangzhou) wrote:

Hi Guenter,

Thank you for your time.
- I will remove the unnecessary {}
- wdd->max_hw_heartbeat_ms is the max timeout value which HW can support, this value is limited according to the input clock, say. It only supports 20 seconds, if users requires to set timeout to be say. 60 seconds, the watchdog device driver 'watchdog_dev.c' checks if wdd->timeout is bigger than wdd->max_hw_heartbeat_ms, if yes, watchdog_dev.c feeds the watchdog by a worker queue itself to help to feed the watchdog before 60 seconds elapse. Here the issue of dw_wdt.c is that, the original codes update wdd->timeout to the value which HW can support, which means if users requires 60 seconds to be the timeout, then dw_wdt.c updates the timeout value to 20 seconds, this makes the "feeding helper" mechanism in watchdog_dev.c not take effect. That's why I add this check.

Yes, I understand you need a check. What I am saying is that the check is wrong.

You need something like

	if (top_s > DW_WDT_MAX_TOP)
		wdt->timeout = top_s;
	else
		wdt->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);

Guenter

Quoted 57 lines

Thanks,
Peng Wang

-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Thursday, November 21, 2019 1:15 AM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger timeout value

Quoted 23 lines · On Wed, Nov 20, 2019 at 10:07:57AM +0000, Wang, Peng 1. (NSB - CN/Hangzhou)…

From 1d051b7c081083751dc0bab97d3ab9efbba0f4a7 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 | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
drivers/watchdog/dw_wdt.c +0 -1
index fef7c61..8911e5e 100644
@@ -113,8 +113,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);
-

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

Quoted 10 lines
drivers/watchdog/dw_wdt.c +9 -1
-	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 ( wdd->timeout * 1000 <= wdd->max_hw_heartbeat_ms ) {
+	    wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+    }

{ } is unnecessary here. Also, the above code compares the _old_ timeout againt the maximum supported timeout, which doesn't look correct.

Thanks,
Guenter

Quoted 6 lines
drivers/watchdog/dw_wdt.c +0 -1
  	return 0;
  }
--

1.8.3.1

#4 lore raw

Actually, this function is used by watchdog_dev.c, the timeout value in wdd is already modified there. but yes, you are right, decide the actual timeout value here is more reasonable. :)

thanks,
Peng Wang
-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Thursday, November 21, 2019 11:41 AM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger timeout value

Quoted 6 lines · On 11/20/19 5:29 PM, Wang, Peng 1. (NSB - CN/Hangzhou) wrote:

Hi Guenter,

Thank you for your time.
- I will remove the unnecessary {}
- wdd->max_hw_heartbeat_ms is the max timeout value which HW can support, this value is limited according to the input clock, say. It only supports 20 seconds, if users requires to set timeout to be say. 60 seconds, the watchdog device driver 'watchdog_dev.c' checks if wdd->timeout is bigger than wdd->max_hw_heartbeat_ms, if yes, watchdog_dev.c feeds the watchdog by a worker queue itself to help to feed the watchdog before 60 seconds elapse. Here the issue of dw_wdt.c is that, the original codes update wdd->timeout to the value which HW can support, which means if users requires 60 seconds to be the timeout, then dw_wdt.c updates the timeout value to 20 seconds, this makes the "feeding helper" mechanism in watchdog_dev.c not take effect. That's why I add this check.

Yes, I understand you need a check. What I am saying is that the check is wrong.

You need something like

	if (top_s > DW_WDT_MAX_TOP)
		wdt->timeout = top_s;
	else
		wdt->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);

Guenter

Quoted 61 lines

Thanks,
Peng Wang

-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Thursday, November 21, 2019 1:15 AM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger timeout value

Quoted 24 lines · On Wed, Nov 20, 2019 at 10:07:57AM +0000, Wang, Peng 1. (NSB - CN/Hangzhou)…

From 1d051b7c081083751dc0bab97d3ab9efbba0f4a7 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 | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
drivers/watchdog/dw_wdt.c +0 -1
index fef7c61..8911e5e 100644
@@ -113,8 +113,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);
-

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

Quoted 10 lines
drivers/watchdog/dw_wdt.c +9 -1
-	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 ( wdd->timeout * 1000 <= wdd->max_hw_heartbeat_ms ) {
+	    wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+    }

{ } is unnecessary here. Also, the above code compares the _old_ timeout againt the maximum supported timeout, which doesn't look correct.

Thanks,
Guenter

Quoted 6 lines
drivers/watchdog/dw_wdt.c +0 -1
  	return 0;
  }
--

1.8.3.1

maintainer
#5 lore raw
Quoted 3 lines · On 11/21/19 12:07 AM, Wang, Peng 1. (NSB - CN/Hangzhou) wrote:

Actually, this function is used by watchdog_dev.c, the timeout value in wdd is already modified there. but yes, you are right, decide the actual timeout value here is more reasonable. :)

Please avoid top-posting.

watchdog_dev.c only sets wdd->timeout if there is no driver function to set it.

Guenter

Quoted 90 lines

thanks,
Peng Wang
-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Thursday, November 21, 2019 11:41 AM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger timeout value

Quoted 6 lines · On 11/20/19 5:29 PM, Wang, Peng 1. (NSB - CN/Hangzhou) wrote:

Hi Guenter,

Thank you for your time.
- I will remove the unnecessary {}
- wdd->max_hw_heartbeat_ms is the max timeout value which HW can support, this value is limited according to the input clock, say. It only supports 20 seconds, if users requires to set timeout to be say. 60 seconds, the watchdog device driver 'watchdog_dev.c' checks if wdd->timeout is bigger than wdd->max_hw_heartbeat_ms, if yes, watchdog_dev.c feeds the watchdog by a worker queue itself to help to feed the watchdog before 60 seconds elapse. Here the issue of dw_wdt.c is that, the original codes update wdd->timeout to the value which HW can support, which means if users requires 60 seconds to be the timeout, then dw_wdt.c updates the timeout value to 20 seconds, this makes the "feeding helper" mechanism in watchdog_dev.c not take effect. That's why I add this check.

Yes, I understand you need a check. What I am saying is that the check is wrong.

You need something like

	if (top_s > DW_WDT_MAX_TOP)
		wdt->timeout = top_s;
	else
		wdt->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);

Guenter

Quoted 61 lines

Thanks,
Peng Wang

-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Thursday, November 21, 2019 1:15 AM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger timeout value

Quoted 24 lines · On Wed, Nov 20, 2019 at 10:07:57AM +0000, Wang, Peng 1. (NSB - CN/Hangzhou)…

From 1d051b7c081083751dc0bab97d3ab9efbba0f4a7 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 | 11 +++++++++--
   1 file changed, 9 insertions(+), 2 deletions(-)
drivers/watchdog/dw_wdt.c +0 -1
index fef7c61..8911e5e 100644
@@ -113,8 +113,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);
-

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

Quoted 10 lines
drivers/watchdog/dw_wdt.c +9 -1
-	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 ( wdd->timeout * 1000 <= wdd->max_hw_heartbeat_ms ) {
+	    wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+    }

{ } is unnecessary here. Also, the above code compares the _old_ timeout againt the maximum supported timeout, which doesn't look correct.

Thanks,
Guenter

Quoted 6 lines
drivers/watchdog/dw_wdt.c +0 -1
   	return 0;
   }
--

1.8.3.1