watchdog: cadence_wdt: Support all available prescaler values
v2 cover watchdog: cadence_wdt: Support all available prescaler values
Cadence watchdog HW supports prescaler values of 8, 64, 512 and 4096, currently only 512 and 4096 are used by driver.
This series adds support to select prescaler values of 8 and 64 for lower input clock frequencies.
Changes v2:
- Add calculation of actual min/max timeout values
- Validate input clock frequencies to not allow frequencies that would result in timeout granularity of > 1 second.
Tomas Melin (4):
watchdog: cadence_wdt: Move clock detection eariler in probe
watchdog: cadence_wdt: Calculate actual timeout limits
watchdog: cadence_wdt: Group struct member init statements
watchdog: cadence_wdt: Support all available prescaler values
drivers/watchdog/cadence_wdt.c | 65 ++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 27 deletions(-)
Signature · 1 line
2.17.2
PATCH v2 1/4 watchdog: cadence_wdt: Move clock detection eariler in probe
Timeout calculation needs clock frequency, so init clock and calculate prescaler value eariler in the probe.
Preparational step for calculating maximum and minimum timeout values for driver.
--- drivers/watchdog/cadence_wdt.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/watchdog/cadence_wdt.c +16 -16
@@ -295,6 +295,22 @@ static int cdns_wdt_probe(struct platform_device *pdev)if (!wdt)return -ENOMEM ; + wdt->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (wdt->clk)) { +dev_err (&pdev->dev,"input clock not found\n" ); + ret =PTR_ERR (wdt->clk); +return ret; + } + + clock_f =clk_get_rate (wdt->clk); +if (clock_f <=CDNS_WDT_CLK_75MHZ ) { + wdt->prescaler =CDNS_WDT_PRESCALE_512 ; + wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_512 ; + }else { + wdt->prescaler =CDNS_WDT_PRESCALE_4096 ; + wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_4096 ; + } + cdns_wdt_device = &wdt->cdns_wdt_device; cdns_wdt_device->info = &cdns_wdt_info; cdns_wdt_device->ops = &cdns_wdt_ops;
@@ -334,28 +350,12 @@ static int cdns_wdt_probe(struct platform_device *pdev)watchdog_stop_on_reboot (cdns_wdt_device);watchdog_set_drvdata (cdns_wdt_device, wdt); - wdt->clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (wdt->clk)) { -dev_err (&pdev->dev,"input clock not found\n" ); - ret =PTR_ERR (wdt->clk); -return ret; - } - ret =clk_prepare_enable (wdt->clk);if (ret) {dev_err (&pdev->dev,"unable to enable clock\n" );return ret; } - clock_f =clk_get_rate (wdt->clk); -if (clock_f <=CDNS_WDT_CLK_75MHZ ) { - wdt->prescaler =CDNS_WDT_PRESCALE_512 ; - wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_512 ; - }else { - wdt->prescaler =CDNS_WDT_PRESCALE_4096 ; - wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_4096 ; - } -spin_lock_init (&wdt->io_lock); ret =watchdog_register_device (cdns_wdt_device);
Signature · 1 line
2.17.2
Guenter Roeck
maintainerRe: [PATCH v2 1/4] watchdog: cadence_wdt: Move clock detection eariler in probe
Quoted 3 lines · Melin Tomas
Timeout calculation needs clock frequency, so init clock and calculate prescaler value eariler in the probe.
earlier; also in subject line
Quoted 13 lines
Preparational step for calculating maximum and minimum timeout values for driver.
Signed-off-by Tomas Melin <[email protected]>--- drivers/watchdog/cadence_wdt.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)drivers/watchdog/cadence_wdt.c +0
-0
drivers/watchdog/cadence_wdt.c static int cdns_wdt_probe(struct platform_device *pdev) · line 302
Quoted 8 lines
drivers/watchdog/cadence_wdt.c +5
-0@@ -295,6 +295,22 @@ static int cdns_wdt_probe(struct platform_device *pdev)if (!wdt)return -ENOMEM ; + wdt->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (wdt->clk)) { +dev_err (&pdev->dev,"input clock not found\n" ); + ret =PTR_ERR (wdt->clk); +return ret;
return PTR_ERR(wdt->clk);
[ ok, that is from the old code ... ]
Quoted 21 lines
drivers/watchdog/cadence_wdt.c +11
-3+ } + + clock_f =clk_get_rate (wdt->clk); +if (clock_f <=CDNS_WDT_CLK_75MHZ ) { + wdt->prescaler =CDNS_WDT_PRESCALE_512 ; + wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_512 ; + }else { + wdt->prescaler =CDNS_WDT_PRESCALE_4096 ; + wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_4096 ; + } + cdns_wdt_device = &wdt->cdns_wdt_device; cdns_wdt_device->info = &cdns_wdt_info; cdns_wdt_device->ops = &cdns_wdt_ops;@@ -334,28 +350,12 @@ static int cdns_wdt_probe(struct platform_device *pdev)watchdog_stop_on_reboot (cdns_wdt_device);watchdog_set_drvdata (cdns_wdt_device, wdt); - wdt->clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (wdt->clk)) { -dev_err (&pdev->dev,"input clock not found\n" );
drivers/watchdog/cadence_wdt.c static int cdns_wdt_probe(struct platform_device *pdev) · line 358
Quoted 10 lines
drivers/watchdog/cadence_wdt.c +0
-4- ret =PTR_ERR (wdt->clk); -return ret; - } - ret =clk_prepare_enable (wdt->clk);if (ret) {dev_err (&pdev->dev,"unable to enable clock\n" );return ret; }
The substantial difference here is that clk_prepare_enable() was called before the actual clock rate was retrieved. I don't know if that makes a substantial difference, but on the other side I don't see why the above code isn't moved as well. What I _do_ see, however, is that this patch isn't based on the latest mainline kenrel, since mainline has a call to devm_add_action_or_reset() after clk_prepare_enable(). Please rebase.
Quoted 12 lines
drivers/watchdog/cadence_wdt.c +0
-9- clock_f =clk_get_rate (wdt->clk); -if (clock_f <=CDNS_WDT_CLK_75MHZ ) { - wdt->prescaler =CDNS_WDT_PRESCALE_512 ; - wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_512 ; - }else { - wdt->prescaler =CDNS_WDT_PRESCALE_4096 ; - wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_4096 ; - } -spin_lock_init (&wdt->io_lock); ret =watchdog_register_device (cdns_wdt_device);
PATCH v2 2/4 watchdog: cadence_wdt: Calculate actual timeout limits
In reply to Melin TomasMaximum and minimum timeout values depend on the actual input clock frequency and prescaler selection.
--- drivers/watchdog/cadence_wdt.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/watchdog/cadence_wdt.c +8 -5
@@ -18,9 +18,6 @@#include <linux/watchdog.h> #define CDNS_WDT_DEFAULT_TIMEOUT 10 -/* Supports 1 - 516 sec */ -#define CDNS_WDT_MIN_TIMEOUT 1 -#define CDNS_WDT_MAX_TIMEOUT 516/* Restart key */ #define CDNS_WDT_RESTART_KEY 0x00001999
@@ -28,6 +25,10 @@/* Counter register access key */ #define CDNS_WDT_REGISTER_ACCESS_KEY 0x00920000 +/* Counter control register, counter restart values */ +#define CDNS_WDT_CCR_CRV_MIN 0xFFF +#define CDNS_WDT_CCR_CRV_MAX 0xFFFFFF +/* Counter value divisor */ #define CDNS_WDT_COUNTER_VALUE_DIVISOR 0x1000
@@ -315,8 +316,10 @@ static int cdns_wdt_probe(struct platform_device *pdev) cdns_wdt_device->info = &cdns_wdt_info; cdns_wdt_device->ops = &cdns_wdt_ops; cdns_wdt_device->timeout =CDNS_WDT_DEFAULT_TIMEOUT ; - cdns_wdt_device->min_timeout =CDNS_WDT_MIN_TIMEOUT ; - cdns_wdt_device->max_timeout =CDNS_WDT_MAX_TIMEOUT ; + cdns_wdt_device->min_timeout = +CDNS_WDT_CCR_CRV_MIN * wdt->prescaler / clock_f; + cdns_wdt_device->max_timeout = +CDNS_WDT_CCR_CRV_MAX * wdt->prescaler / clock_f; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); wdt->regs =devm_ioremap_resource (&pdev->dev, res);
Signature · 1 line
2.17.2
Guenter Roeck
maintainerRe: [PATCH v2 2/4] watchdog: cadence_wdt: Calculate actual timeout limits
Quoted 34 lines · Melin Tomas
Maximum and minimum timeout values depend on the actual input clock frequency and prescaler selection.
Signed-off-by Tomas Melin <[email protected]>--- drivers/watchdog/cadence_wdt.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)drivers/watchdog/cadence_wdt.c +4
-3@@ -18,9 +18,6 @@#include <linux/watchdog.h> #define CDNS_WDT_DEFAULT_TIMEOUT 10 -/* Supports 1 - 516 sec */ -#define CDNS_WDT_MIN_TIMEOUT 1 -#define CDNS_WDT_MAX_TIMEOUT 516/* Restart key */ #define CDNS_WDT_RESTART_KEY 0x00001999@@ -28,6 +25,10 @@/* Counter register access key */ #define CDNS_WDT_REGISTER_ACCESS_KEY 0x00920000 +/* Counter control register, counter restart values */ +#define CDNS_WDT_CCR_CRV_MIN 0xFFF +#define CDNS_WDT_CCR_CRV_MAX 0xFFFFFF +/* Counter value divisor */ #define CDNS_WDT_COUNTER_VALUE_DIVISOR 0x1000
drivers/watchdog/cadence_wdt.c static int cdns_wdt_probe(struct platform_device *pdev) · line 322
Quoted 9 lines
drivers/watchdog/cadence_wdt.c +4
-2@@ -315,8 +316,10 @@ static int cdns_wdt_probe(struct platform_device *pdev) cdns_wdt_device->info = &cdns_wdt_info; cdns_wdt_device->ops = &cdns_wdt_ops; cdns_wdt_device->timeout =CDNS_WDT_DEFAULT_TIMEOUT ; - cdns_wdt_device->min_timeout =CDNS_WDT_MIN_TIMEOUT ; - cdns_wdt_device->max_timeout =CDNS_WDT_MAX_TIMEOUT ; + cdns_wdt_device->min_timeout = +CDNS_WDT_CCR_CRV_MIN * wdt->prescaler / clock_f; + cdns_wdt_device->max_timeout = +CDNS_WDT_CCR_CRV_MAX * wdt->prescaler / clock_f;
clock_f can at least in theory be 0. So far that didn't matter as much, but now it would crash the kernel. Please add a respective check into the code.
Quoted 3 lines
drivers/watchdog/cadence_wdt.c +0
-0res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); wdt->regs =devm_ioremap_resource (&pdev->dev, res);
PATCH v2 3/4 watchdog: cadence_wdt: Group struct member init statements
In reply to Melin TomasMove init statement and remove stray comment.
--- drivers/watchdog/cadence_wdt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/watchdog/cadence_wdt.c +1 -3
@@ -313,6 +313,7 @@ static int cdns_wdt_probe(struct platform_device *pdev) } cdns_wdt_device = &wdt->cdns_wdt_device; + cdns_wdt_device->parent = &pdev->dev; cdns_wdt_device->info = &cdns_wdt_info; cdns_wdt_device->ops = &cdns_wdt_ops; cdns_wdt_device->timeout =CDNS_WDT_DEFAULT_TIMEOUT ;
@@ -340,9 +341,6 @@ static int cdns_wdt_probe(struct platform_device *pdev) } } -/* Initialize the members of cdns_wdt structure */ - cdns_wdt_device->parent = &pdev->dev; - ret =watchdog_init_timeout (cdns_wdt_device, wdt_timeout, &pdev->dev);if (ret) {dev_err (&pdev->dev,"unable to set timeout value\n" );
Signature · 1 line
2.17.2
Guenter Roeck
maintainerRe: [PATCH v2 3/4] watchdog: cadence_wdt: Group struct member init statements
Quoted 12 lines · Melin Tomas
Move init statement and remove stray comment.
Signed-off-by Tomas Melin <[email protected]>--- drivers/watchdog/cadence_wdt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/watchdog/cadence_wdt.c +0
-0
drivers/watchdog/cadence_wdt.c static int cdns_wdt_probe(struct platform_device *pdev) · line 316
Quoted 4 lines
drivers/watchdog/cadence_wdt.c +1
-0@@ -313,6 +313,7 @@ static int cdns_wdt_probe(struct platform_device *pdev) } cdns_wdt_device = &wdt->cdns_wdt_device; + cdns_wdt_device->parent = &pdev->dev;
In the upstream kernel, we have
struct device *dev = &pdev->dev; and cdns_wdt_device->parent = dev;
so this patch no longer applies.
Quoted 13 lines
drivers/watchdog/cadence_wdt.c +0
-3cdns_wdt_device->info = &cdns_wdt_info; cdns_wdt_device->ops = &cdns_wdt_ops; cdns_wdt_device->timeout =CDNS_WDT_DEFAULT_TIMEOUT ;@@ -340,9 +341,6 @@ static int cdns_wdt_probe(struct platform_device *pdev) } } -/* Initialize the members of cdns_wdt structure */ - cdns_wdt_device->parent = &pdev->dev; - ret =watchdog_init_timeout (cdns_wdt_device, wdt_timeout, &pdev->dev);if (ret) {dev_err (&pdev->dev,"unable to set timeout value\n" );
PATCH v2 4/4 watchdog: cadence_wdt: Support all available prescaler values
In reply to Melin TomasCadence watchdog HW supports prescaler values of
8, 64, 512 and 4096.
Add support to select prescaler values of 8 and 64 for lower input clock frequencies.
Prescaler value is selected to keep timeout resolution of 1 second. For clock frequencies below 32kHz, 1 second resolution does no longer hold, thereby returning an error.
--- drivers/watchdog/cadence_wdt.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/watchdog/cadence_wdt.c +14 -4
@@ -33,16 +33,17 @@#define CDNS_WDT_COUNTER_VALUE_DIVISOR 0x1000/* Clock prescaler value and selection */ +#define CDNS_WDT_PRESCALE_8 8#define CDNS_WDT_PRESCALE_64 64#define CDNS_WDT_PRESCALE_512 512#define CDNS_WDT_PRESCALE_4096 4096 +#define CDNS_WDT_PRESCALE_SELECT_8 0#define CDNS_WDT_PRESCALE_SELECT_64 1#define CDNS_WDT_PRESCALE_SELECT_512 2#define CDNS_WDT_PRESCALE_SELECT_4096 3 -/* Input clock frequency */ -#define CDNS_WDT_CLK_10MHZ 10000000 -#define CDNS_WDT_CLK_75MHZ 75000000 +/* Base input clock frequency */ +#define CDNS_WDT_CLK_32KHZ 32768/* Counter maximum value */ #define CDNS_WDT_COUNTER_MAX 0xFFF
@@ -304,7 +305,16 @@ static int cdns_wdt_probe(struct platform_device *pdev) } clock_f =clk_get_rate (wdt->clk); -if (clock_f <=CDNS_WDT_CLK_75MHZ ) { +if (clock_f <CDNS_WDT_CLK_32KHZ ) { +dev_err (&pdev->dev,"cannot find suitable clock prescaler\n" ); +return -ERANGE ; + }else if (clock_f <=CDNS_WDT_CLK_32KHZ *CDNS_WDT_PRESCALE_8 ) { + wdt->prescaler =CDNS_WDT_PRESCALE_8 ; + wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_8 ; + }else if (clock_f <=CDNS_WDT_CLK_32KHZ *CDNS_WDT_PRESCALE_64 ) { + wdt->prescaler =CDNS_WDT_PRESCALE_64 ; + wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_64 ; + }else if (clock_f <=CDNS_WDT_CLK_32KHZ *CDNS_WDT_PRESCALE_512 ) { wdt->prescaler =CDNS_WDT_PRESCALE_512 ; wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_512 ; }else {
Signature · 1 line
2.17.2
Guenter Roeck
maintainerQuoted 41 lines · Melin Tomas
Cadence watchdog HW supports prescaler values of
8, 64, 512 and 4096.Add support to select prescaler values of 8 and 64 for lower input clock frequencies.
Prescaler value is selected to keep timeout resolution of 1 second. For clock frequencies below 32kHz, 1 second resolution does no longer hold, thereby returning an error.
Signed-off-by Tomas Melin <[email protected]>--- drivers/watchdog/cadence_wdt.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)drivers/watchdog/cadence_wdt.c +4
-3@@ -33,16 +33,17 @@#define CDNS_WDT_COUNTER_VALUE_DIVISOR 0x1000/* Clock prescaler value and selection */ +#define CDNS_WDT_PRESCALE_8 8#define CDNS_WDT_PRESCALE_64 64#define CDNS_WDT_PRESCALE_512 512#define CDNS_WDT_PRESCALE_4096 4096 +#define CDNS_WDT_PRESCALE_SELECT_8 0#define CDNS_WDT_PRESCALE_SELECT_64 1#define CDNS_WDT_PRESCALE_SELECT_512 2#define CDNS_WDT_PRESCALE_SELECT_4096 3 -/* Input clock frequency */ -#define CDNS_WDT_CLK_10MHZ 10000000 -#define CDNS_WDT_CLK_75MHZ 75000000 +/* Base input clock frequency */ +#define CDNS_WDT_CLK_32KHZ 32768/* Counter maximum value */ #define CDNS_WDT_COUNTER_MAX 0xFFF
drivers/watchdog/cadence_wdt.c static int cdns_wdt_probe(struct platform_device *pdev) · line 310
Quoted 7 lines
drivers/watchdog/cadence_wdt.c +3
-1@@ -304,7 +305,16 @@ static int cdns_wdt_probe(struct platform_device *pdev) } clock_f =clk_get_rate (wdt->clk); -if (clock_f <=CDNS_WDT_CLK_75MHZ ) { +if (clock_f <CDNS_WDT_CLK_32KHZ ) { +dev_err (&pdev->dev,"cannot find suitable clock prescaler\n" ); +return -ERANGE ;
/* Math result not representable */
is a bit misleading here. I understand there isn't a good option, but using math errors isn't it. Just use -EINVAL if you don't have a better idea. It might also make sense to display the returned clock frequency.
Quoted 10 lines
drivers/watchdog/cadence_wdt.c +7
-0+ }else if (clock_f <=CDNS_WDT_CLK_32KHZ *CDNS_WDT_PRESCALE_8 ) { + wdt->prescaler =CDNS_WDT_PRESCALE_8 ; + wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_8 ; + }else if (clock_f <=CDNS_WDT_CLK_32KHZ *CDNS_WDT_PRESCALE_64 ) { + wdt->prescaler =CDNS_WDT_PRESCALE_64 ; + wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_64 ; + }else if (clock_f <=CDNS_WDT_CLK_32KHZ *CDNS_WDT_PRESCALE_512 ) { wdt->prescaler =CDNS_WDT_PRESCALE_512 ; wdt->ctrl_clksel =CDNS_WDT_PRESCALE_SELECT_512 ; }else {