watchdog: make DesignWare watchdog allow users to set bigger timeout value
PATCH v2 1/1 watchdog: make DesignWare watchdog allow users to set bigger timeout value
From aabaa4b709bd451e566c906e8d1dca48f92f9b12 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.
---
v2 -> v1:
- use top_s to compare with wdd->max_hw_heartbeat_ms
- update wdd->timeout in case it's greater than HW supports
- fix comments error
v1: initial version
--- drivers/watchdog/dw_wdt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/watchdog/dw_wdt.c +9 -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->max_hw_heartbeat_ms +*/ +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
Quoted 11 lines · On Thu, Nov 21, 2019 at 10:35:12AM +0000, Wang, Peng 1. (NSB - CN/Hangzhou)…
From
aabaa4b709bd451e566c906e8d1dca48f92f9b12Mon 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.cprovides means to allow users to set bigger timeout value than HW can support, make DesignWare watchdog align with this.---
Quoted 8 lines
v2 -> v1:
- usetop_sto compare withwdd->max_hw_heartbeat_ms
- updatewdd->timeoutin case it's greater than HW supports
- fix comments errorv1: initial version
Signed-off-by Peng Wang <[email protected]>
Quoted 28 lines
--- drivers/watchdog/dw_wdt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/watchdog/dw_wdt.c +9
-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->max_hw_heartbeat_ms +*/ +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
Wang, Peng 1. (NSB - CN/Hangzhou)
Reviewed-by Guenter RoeckQuoted 1 line
Reviewed-by Guenter Roeck <[email protected]>
Roeck, thanks for your time to guide me to finish the review. Do I need to re-send a mail with your sign?
Peng Wang
-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Thursday, November 21, 2019 10:15 PM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>
Cc: Guenter Roeck <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2] watchdog: make DesignWare watchdog allow users to set bigger timeout value
Quoted 11 lines · On Thu, Nov 21, 2019 at 10:35:12AM +0000, Wang, Peng 1. (NSB - CN/Hangzhou)…
From
aabaa4b709bd451e566c906e8d1dca48f92f9b12Mon 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.cprovides means to allow users to set bigger timeout value than HW can support, make DesignWare watchdog align with this.---
Quoted 8 lines
v2 -> v1:
- usetop_sto compare withwdd->max_hw_heartbeat_ms
- updatewdd->timeoutin case it's greater than HW supports
- fix comments errorv1: initial version
Signed-off-by Peng Wang <[email protected]>
Quoted 28 lines
--- drivers/watchdog/dw_wdt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/watchdog/dw_wdt.c +9
-2@@ -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->max_hw_heartbeat_ms +*/ +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 ; } --1.8.3.1
Guenter Roeck
maintainerQuoted 4 lines · On 11/21/19 5:16 PM, Wang, Peng 1. (NSB - CN/Hangzhou) wrote:
Quoted 1 line
Reviewed-by Guenter Roeck <[email protected]>Roeck, thanks for your time to guide me to finish the review. Do I need to re-send a mail with your sign?
No, that won't be necessary.
Guenter
Quoted 61 lines
Peng Wang
-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Thursday, November 21, 2019 10:15 PM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>
Cc: Guenter Roeck <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2] watchdog: make DesignWare watchdog allow users to set bigger timeout valueQuoted 11 lines · On Thu, Nov 21, 2019 at 10:35:12AM +0000, Wang, Peng 1. (NSB - CN/Hangzhou)…
From
aabaa4b709bd451e566c906e8d1dca48f92f9b12Mon 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.cprovides means to allow users to set bigger timeout value than HW can support, make DesignWare watchdog align with this.---
Quoted 8 lines
v2 -> v1:
- usetop_sto compare withwdd->max_hw_heartbeat_ms
- updatewdd->timeoutin case it's greater than HW supports
- fix comments errorv1: initial version
Signed-off-by Peng Wang <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Quoted 28 lines
--- drivers/watchdog/dw_wdt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/watchdog/dw_wdt.c +9
-2@@ -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->max_hw_heartbeat_ms +*/ +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 ; } --1.8.3.1
Quoted 1 line
No, that won't be necessary.
ok, thank you very much again :)
Peng Wang
-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Friday, November 22, 2019 10:41 AM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>
Cc: Guenter Roeck <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2] watchdog: make DesignWare watchdog allow users to set bigger timeout value
Quoted 4 lines · On 11/21/19 5:16 PM, Wang, Peng 1. (NSB - CN/Hangzhou) wrote:
Quoted 1 line
Reviewed-by Guenter Roeck <[email protected]>Roeck, thanks for your time to guide me to finish the review. Do I need to re-send a mail with your sign?
No, that won't be necessary.
Guenter
Quoted 65 lines
Peng Wang
-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Thursday, November 21, 2019 10:15 PM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>
Cc: Guenter Roeck <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2] watchdog: make DesignWare watchdog allow users to set bigger timeout valueQuoted 12 lines · On Thu, Nov 21, 2019 at 10:35:12AM +0000, Wang, Peng 1. (NSB - CN/Hangzhou)…
From
aabaa4b709bd451e566c906e8d1dca48f92f9b12Mon 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.cprovides means to allow users to set bigger timeout value than HW can support, make DesignWare watchdog align with this.---
Quoted 8 lines
v2 -> v1:
- usetop_sto compare withwdd->max_hw_heartbeat_ms
- updatewdd->timeoutin case it's greater than HW supports
- fix comments errorv1: initial version
Signed-off-by Peng Wang <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Quoted 28 lines
--- drivers/watchdog/dw_wdt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/watchdog/dw_wdt.c +9
-2@@ -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->max_hw_heartbeat_ms +*/ +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 ; } --1.8.3.1
Quoted 11 lines · On 11/21/19 2:35 AM, Wang, Peng 1. (NSB - CN/Hangzhou) wrote:
From
aabaa4b709bd451e566c906e8d1dca48f92f9b12Mon 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.cprovides means to allow users to set bigger timeout value than HW can support, make DesignWare watchdog align with this.---
Quoted 8 lines
v2 -> v1:
- usetop_sto compare withwdd->max_hw_heartbeat_ms
- updatewdd->timeoutin case it's greater than HW supports
- fix comments errorv1: initial version
Signed-off-by Peng Wang <[email protected]>
Sigh. I should have paid closer attention. Signed-off-by: has to be ahead of ---,
and the change log after it. The above format messes up everything.
Also, please run checkpatch and fix the problems it reports.
Sorry for not noticing it earlier. Please fix the problems and resubmit.
Thanks,
Guenter
Quoted 25 lines
--- drivers/watchdog/dw_wdt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/watchdog/dw_wdt.c +9
-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->max_hw_heartbeat_ms +*/ +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 ; }
Quoted 4 lines
Sigh. I should have paid closer attention. Signed-off-by: has to be ahead of ---, and the change log after it. The above format messes up everything. Also, please run checkpatch and fix the problems it reports.
Sorry for not noticing it earlier. Please fix the problems and resubmit.
Ok, I'll re-submit the patch.
Thanks,
Peng Wang
-----Original Message-----
From: Guenter Roeck [mailto:[email protected]] On Behalf Of Guenter Roeck
Sent: Friday, November 22, 2019 1:39 PM
To: Wang, Peng 1. (NSB - CN/Hangzhou) <[email protected]>; Guenter Roeck <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2] watchdog: make DesignWare watchdog allow users to set bigger timeout value
Quoted 12 lines · On 11/21/19 2:35 AM, Wang, Peng 1. (NSB - CN/Hangzhou) wrote:
From
aabaa4b709bd451e566c906e8d1dca48f92f9b12Mon 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.cprovides means to allow users to set bigger timeout value than HW can support, make DesignWare watchdog align with this.---
Quoted 8 lines
v2 -> v1:
- usetop_sto compare withwdd->max_hw_heartbeat_ms
- updatewdd->timeoutin case it's greater than HW supports
- fix comments errorv1: initial version
Signed-off-by Peng Wang <[email protected]>
Sigh. I should have paid closer attention. Signed-off-by: has to be ahead of ---,
and the change log after it. The above format messes up everything.
Also, please run checkpatch and fix the problems it reports.
Sorry for not noticing it earlier. Please fix the problems and resubmit.
Thanks,
Guenter
Quoted 25 lines
--- drivers/watchdog/dw_wdt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/watchdog/dw_wdt.c +9
-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->max_hw_heartbeat_ms +*/ +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 ; }