watchdog: imgpdc: Allow timeout to be set in device-tree
PATCH v3 1/3 watchdog: imgpdc: Allow timeout to be set in device-tree
Since the heartbeat is statically initialized to its default value, watchdog_init_timeout() will never look in the device-tree for a timeout-sec value. Instead of statically initializing heartbeat, fall back to the default timeout value if watchdog_init_timeout() fails.
---
Changes from v2:
- Set timeout before calling watchdog_init_timeout
- Don't print an error on watchdog_init_timeout failure
New for v2.
--- drivers/watchdog/imgpdc_wdt.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/watchdog/imgpdc_wdt.c +3 -7
@@ -42,7 +42,7 @@#define PDC_WDT_MIN_TIMEOUT 1#define PDC_WDT_DEF_TIMEOUT 64 -static int heartbeat =PDC_WDT_DEF_TIMEOUT ; +static int heartbeat;module_param (heartbeat, int,0 ); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds " "(default=" __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")");
@@ -190,15 +190,11 @@ static int pdc_wdt_probe(struct platform_device *pdev) pdc_wdt->wdt_dev.info = &pdc_wdt_info; pdc_wdt->wdt_dev.ops = &pdc_wdt_ops; pdc_wdt->wdt_dev.max_timeout =1 <<PDC_WDT_CONFIG_DELAY_MASK ; + pdc_wdt->wdt_dev.timeout =PDC_WDT_DEF_TIMEOUT ; pdc_wdt->wdt_dev.parent = &pdev->dev;watchdog_set_drvdata (&pdc_wdt->wdt_dev, pdc_wdt); - ret =watchdog_init_timeout (&pdc_wdt->wdt_dev, heartbeat, &pdev->dev); -if (ret <0 ) { - pdc_wdt->wdt_dev.timeout = pdc_wdt->wdt_dev.max_timeout; -dev_warn (&pdev->dev, -"Initial timeout out of range! setting max timeout\n" ); - } +watchdog_init_timeout (&pdc_wdt->wdt_dev, heartbeat, &pdev->dev);pdc_wdt_stop (&pdc_wdt->wdt_dev);
Signature · 1 line
2.2.0.rc0.207.ga3a616c
PATCH v3 2/3 watchdog: imgpdc: Set timeout before starting watchdog
Set up the watchdog for the specified timeout before attempting to start it.
---
No changes from v2.
Changes from v1:
- Moved setting of timeout to a helper as suggested by Guenter.
--- drivers/watchdog/imgpdc_wdt.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/watchdog/imgpdc_wdt.c +13 -5
@@ -84,18 +84,24 @@ static int pdc_wdt_stop(struct watchdog_device *wdt_dev)return 0 ; } +static void __pdc_wdt_set_timeout (struct pdc_wdt_dev *wdt) +{ +unsigned long clk_rate =clk_get_rate (wdt->wdt_clk); +unsigned int val; + + val =readl (wdt->base +PDC_WDT_CONFIG ) & ~PDC_WDT_CONFIG_DELAY_MASK ; + val |=order_base_2 (wdt->wdt_dev.timeout * clk_rate) -1 ; +writel (val, wdt->base +PDC_WDT_CONFIG ); +} +static int pdc_wdt_set_timeout (struct watchdog_device *wdt_dev,unsigned int new_timeout) { -unsigned int val;struct pdc_wdt_dev *wdt =watchdog_get_drvdata (wdt_dev); -unsigned long clk_rate =clk_get_rate (wdt->wdt_clk); wdt->wdt_dev.timeout = new_timeout; - val =readl (wdt->base +PDC_WDT_CONFIG ) & ~PDC_WDT_CONFIG_DELAY_MASK ; - val |=order_base_2 (new_timeout * clk_rate) -1 ; -writel (val, wdt->base +PDC_WDT_CONFIG ); +__pdc_wdt_set_timeout (wdt);return 0 ; }
@@ -106,6 +112,8 @@ static int pdc_wdt_start(struct watchdog_device *wdt_dev)unsigned int val;struct pdc_wdt_dev *wdt =watchdog_get_drvdata (wdt_dev); +__pdc_wdt_set_timeout (wdt); + val =readl (wdt->base +PDC_WDT_CONFIG ); val |=PDC_WDT_CONFIG_ENABLE ;writel (val, wdt->base +PDC_WDT_CONFIG );
Signature · 1 line
2.2.0.rc0.207.ga3a616c
Re: [PATCH V3 2/3] watchdog: imgpdc: Set timeout before starting watchdog
Quoted 6 lines · Andrew Bresticker
Set up the watchdog for the specified timeout before attempting to start it.
Signed-off-by Naidu Tellapati <[email protected]>Signed-off-by Andrew Bresticker <[email protected]>Cc Ezequiel Garcia <[email protected]>Cc James Hogan <[email protected]>
PATCH v3 3/3 watchdog: imgpdc: Add reboot support
In reply to Andrew BrestickerRegister a restart handler that will restart the system by writing to the watchdog's SOFT_RESET register.
---
No changes from v1/v2.
--- drivers/watchdog/imgpdc_wdt.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/watchdog/imgpdc_wdt.c +21 -0
@@ -16,6 +16,7 @@#include <linux/log2.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/reboot.h> #include <linux/slab.h> #include <linux/watchdog.h>
@@ -57,6 +58,7 @@ struct pdc_wdt_dev {struct clk *wdt_clk;struct clk *sys_clk;void __iomem *base; +struct notifier_block restart_handler; };static int pdc_wdt_keepalive (struct watchdog_device *wdt_dev)
@@ -136,6 +138,18 @@ static const struct watchdog_ops pdc_wdt_ops = { .set_timeout = pdc_wdt_set_timeout, }; +static int pdc_wdt_restart (struct notifier_block *this,unsigned long mode, +void *cmd) +{ + struct pdc_wdt_dev *wdt = container_of(this, struct pdc_wdt_dev, + restart_handler); + +/* Assert SOFT_RESET */ +writel (0x1 , wdt->base +PDC_WDT_SOFT_RESET ); + +return NOTIFY_OK ; +} +static int pdc_wdt_probe (struct platform_device *pdev) {int ret, val;
@@ -242,6 +256,13 @@ static int pdc_wdt_probe(struct platform_device *pdev)if (ret) goto disable_wdt_clk; + pdc_wdt->restart_handler.notifier_call = pdc_wdt_restart; + pdc_wdt->restart_handler.priority =128 ; + ret =register_restart_handler (&pdc_wdt->restart_handler); +if (ret) +dev_warn (&pdev->dev,"failed to register restart handler: %d\n" , + ret); +return 0 ; disable_wdt_clk:
Signature · 1 line
2.2.0.rc0.207.ga3a616c
Quoted 9 lines · Andrew Bresticker
Since the heartbeat is statically initialized to its default value,
watchdog_init_timeout()will never look in the device-tree for a timeout-sec value. Instead of statically initializing heartbeat, fall back to the default timeout value ifwatchdog_init_timeout()fails.Signed-off-by Andrew Bresticker <[email protected]>Cc Ezequiel Garcia <[email protected]>Cc James Hogan <[email protected]>
Quoted 41 lines
---
Changes from v2:
- Set timeout before callingwatchdog_init_timeout
- Don't print an error onwatchdog_init_timeoutfailure
New for v2.--- drivers/watchdog/imgpdc_wdt.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)drivers/watchdog/imgpdc_wdt.c +3
-7@@ -42,7 +42,7 @@#define PDC_WDT_MIN_TIMEOUT 1#define PDC_WDT_DEF_TIMEOUT 64 -static int heartbeat =PDC_WDT_DEF_TIMEOUT ; +static int heartbeat;module_param (heartbeat, int,0 ); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds " "(default=" __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")");@@ -190,15 +190,11 @@ static int pdc_wdt_probe(struct platform_device *pdev) pdc_wdt->wdt_dev.info = &pdc_wdt_info; pdc_wdt->wdt_dev.ops = &pdc_wdt_ops; pdc_wdt->wdt_dev.max_timeout =1 <<PDC_WDT_CONFIG_DELAY_MASK ; + pdc_wdt->wdt_dev.timeout =PDC_WDT_DEF_TIMEOUT ; pdc_wdt->wdt_dev.parent = &pdev->dev;watchdog_set_drvdata (&pdc_wdt->wdt_dev, pdc_wdt); - ret =watchdog_init_timeout (&pdc_wdt->wdt_dev, heartbeat, &pdev->dev); -if (ret <0 ) { - pdc_wdt->wdt_dev.timeout = pdc_wdt->wdt_dev.max_timeout; -dev_warn (&pdev->dev, -"Initial timeout out of range! setting max timeout\n" ); - } +watchdog_init_timeout (&pdc_wdt->wdt_dev, heartbeat, &pdev->dev);pdc_wdt_stop (&pdc_wdt->wdt_dev);
Quoted 9 lines · Andrew Bresticker
Since the heartbeat is statically initialized to its default value,
watchdog_init_timeout()will never look in the device-tree for a timeout-sec value. Instead of statically initializing heartbeat, fall back to the default timeout value ifwatchdog_init_timeout()fails.Signed-off-by Andrew Bresticker <[email protected]>Cc Ezequiel Garcia <[email protected]>Cc James Hogan <[email protected]>
Signature · 1 line
Ezequiel
Ezequiel Garcia
Tested-byQuoted 9 lines · Ezequiel Garcia
Quoted 6 lines · Andrew Bresticker
Since the heartbeat is statically initialized to its default value,
watchdog_init_timeout()will never look in the device-tree for a timeout-sec value. Instead of statically initializing heartbeat, fall back to the default timeout value ifwatchdog_init_timeout()fails.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Andrew Bresticker <[email protected]>Cc Ezequiel Garcia <[email protected]>Cc James Hogan <[email protected]>Reviewed-by Ezequiel Garcia <[email protected]>
And for the three patches:
Any chance these get merged soon(ishly)?
Signature · 1 line
Ezequiel
Guenter Roeck
maintainerQuoted 16 lines · Ezequiel Garcia
Quoted 13 lines · Ezequiel Garcia
Quoted 9 lines · Andrew Bresticker
Since the heartbeat is statically initialized to its default value,
watchdog_init_timeout()will never look in the device-tree for a timeout-sec value. Instead of statically initializing heartbeat, fall back to the default timeout value ifwatchdog_init_timeout()fails.Signed-off-by Andrew Bresticker <[email protected]>Cc Ezequiel Garcia <[email protected]>Cc James Hogan <[email protected]>
Quoted 9 lines
Quoted 2 lines
Reviewed-by Ezequiel Garcia <[email protected]>And for the three patches:
Tested-by Ezequiel Garcia <[email protected]>Any chance these get merged soon(ishly)?
I added the patches to my test branch. I'll send a pull request to Wim in time for the next commit window, so hopefully the patches should make it into 4.2.
Guenter
Quoted 22 lines · Guenter Roeck
Quoted 21 lines · Ezequiel Garcia
Quoted 9 lines · Ezequiel Garcia
Quoted 6 lines · Andrew Bresticker
Since the heartbeat is statically initialized to its default value,
watchdog_init_timeout()will never look in the device-tree for a timeout-sec value. Instead of statically initializing heartbeat, fall back to the default timeout value ifwatchdog_init_timeout()fails.Quoted 6 lines
Quoted 3 lines
Signed-off-by Andrew Bresticker <[email protected]>Cc Ezequiel Garcia <[email protected]>Cc James Hogan <[email protected]>Reviewed-by Ezequiel Garcia <[email protected]>And for the three patches:
Quoted 9 lines
Quoted 4 lines
Tested-by Ezequiel Garcia <[email protected]>Any chance these get merged soon(ishly)?
I added the patches to my test branch. I'll send a pull request to Wim in time for the next commit window, so hopefully the patches should make it into 4.2.
OK, cool. Thanks a lot.
Signature · 1 line
Ezequiel