Skip to contentSkip to conversation

watchdog: cadence_wdt: Support all available prescaler values

PATCH In review Melin Tomas 2 participants 14 messages Jul 9, 2019 – Jul 11, 2019 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

v3 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 v3:
- Rebased on v5.2
- Move entire clock init block earlier in probe
- Add check for clock rate not being 0
- Add clock rate in error message

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
#1 lore raw

PATCH v3 1/4 watchdog: cadence_wdt: Move clock detection earlier in probe

Timeout calculation needs clock frequency, so init clock and calculate prescaler value earlier in the probe.

Preparational step for calculating maximum and minimum timeout values for driver.

---
 drivers/watchdog/cadence_wdt.c | 50 +++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/watchdog/cadence_wdt.c +25 -25
index a22f2d431a35..ddbf602bdc40 100644
@@ -300,6 +300,31 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 	if (!wdt)
 		return -ENOMEM;
 
+	wdt->clk = devm_clk_get(dev, NULL);
+	if (IS_ERR(wdt->clk)) {
+		dev_err(dev, "input clock not found\n");
+		return PTR_ERR(wdt->clk);
+	}
+
+	ret = clk_prepare_enable(wdt->clk);
+	if (ret) {
+		dev_err(dev, "unable to enable clock\n");
+		return ret;
+	}
+	ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare,
+				       wdt->clk);
+	if (ret)
+		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;
@@ -333,31 +358,6 @@ 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(dev, NULL);
-	if (IS_ERR(wdt->clk)) {
-		dev_err(dev, "input clock not found\n");
-		return PTR_ERR(wdt->clk);
-	}
-
-	ret = clk_prepare_enable(wdt->clk);
-	if (ret) {
-		dev_err(dev, "unable to enable clock\n");
-		return ret;
-	}
-	ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare,
-				       wdt->clk);
-	if (ret)
-		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);
 
 	watchdog_stop_on_reboot(cdns_wdt_device);
Signature · 1 line
2.17.2
maintainer Reviewed-by on v3 1/4
#2 lore raw

Re: [PATCH v3 1/4] watchdog: cadence_wdt: Move clock detection earlier in probe

Quoted 7 lines · Melin Tomas

Timeout calculation needs clock frequency, so init clock and calculate prescaler value earlier in the probe.

Preparational step for calculating maximum and minimum timeout values for driver.

Quoted 75 lines
---
 drivers/watchdog/cadence_wdt.c | 50 +++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/watchdog/cadence_wdt.c +25 -25
index a22f2d431a35..ddbf602bdc40 100644
@@ -300,6 +300,31 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 	if (!wdt)
 		return -ENOMEM;
 
+	wdt->clk = devm_clk_get(dev, NULL);
+	if (IS_ERR(wdt->clk)) {
+		dev_err(dev, "input clock not found\n");
+		return PTR_ERR(wdt->clk);
+	}
+
+	ret = clk_prepare_enable(wdt->clk);
+	if (ret) {
+		dev_err(dev, "unable to enable clock\n");
+		return ret;
+	}
+	ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare,
+				       wdt->clk);
+	if (ret)
+		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;
@@ -333,31 +358,6 @@ 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(dev, NULL);
-	if (IS_ERR(wdt->clk)) {
-		dev_err(dev, "input clock not found\n");
-		return PTR_ERR(wdt->clk);
-	}
-
-	ret = clk_prepare_enable(wdt->clk);
-	if (ret) {
-		dev_err(dev, "unable to enable clock\n");
-		return ret;
-	}
-	ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare,
-				       wdt->clk);
-	if (ret)
-		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);
 
 	watchdog_stop_on_reboot(cdns_wdt_device);
Signature · 1 line
2.17.2
#3 lore raw

PATCH v3 2/4 watchdog: cadence_wdt: Calculate actual timeout limits

In reply to Melin Tomas

Maximum and minimum timeout values depend on the actual input clock frequency and prescaler selection.

---
 drivers/watchdog/cadence_wdt.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/watchdog/cadence_wdt.c +12 -6
index ddbf602bdc40..a0d7666e7d20 100644
@@ -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
 
@@ -317,7 +318,10 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 		return ret;
 
 	clock_f = clk_get_rate(wdt->clk);
-	if (clock_f <= CDNS_WDT_CLK_75MHZ) {
+	if (clock_f == 0) {
+		dev_err(dev, "invalid clock frequency, (f=%lu)\n", clock_f);
+		return -EINVAL;
+	} else if (clock_f <= CDNS_WDT_CLK_75MHZ) {
 		wdt->prescaler = CDNS_WDT_PRESCALE_512;
 		wdt->ctrl_clksel = CDNS_WDT_PRESCALE_SELECT_512;
 	} else {
@@ -329,8 +333,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;
 
 	wdt->regs = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(wdt->regs))
Signature · 1 line
2.17.2
maintainer
#4 lore raw

Re: [PATCH v3 2/4] watchdog: cadence_wdt: Calculate actual timeout limits

Quoted 23 lines · Melin Tomas

Maximum and minimum timeout values depend on the actual input clock frequency and prescaler selection.

---
 drivers/watchdog/cadence_wdt.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/watchdog/cadence_wdt.c +0 -3
index ddbf602bdc40..a0d7666e7d20 100644
@@ -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

drivers/watchdog/cadence_wdt.c line 30

Quoted 6 lines
drivers/watchdog/cadence_wdt.c +3 -0
@@ -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

^ Please use tabs here

drivers/watchdog/cadence_wdt.c static int cdns_wdt_probe(struct platform_device *pdev) · line 322

Quoted 11 lines
drivers/watchdog/cadence_wdt.c +3 -1
+
 /* Counter value divisor */
 #define CDNS_WDT_COUNTER_VALUE_DIVISOR 0x1000
 
@@ -317,7 +318,10 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 		return ret;
 
 	clock_f = clk_get_rate(wdt->clk);
-	if (clock_f <= CDNS_WDT_CLK_75MHZ) {
+	if (clock_f == 0) {
+		dev_err(dev, "invalid clock frequency, (f=%lu)\n", clock_f);

We know that clock_f is 0 here. No need to use %lu.

drivers/watchdog/cadence_wdt.c static int cdns_wdt_probe(struct platform_device *pdev) · line 323

Quoted 1 line
drivers/watchdog/cadence_wdt.c +1 -0
+		return -EINVAL;

else after return is unnecessary (and static checkers will rightfully complain).

Quoted 20 lines
drivers/watchdog/cadence_wdt.c +5 -2
+	} else if (clock_f <= CDNS_WDT_CLK_75MHZ) {
 		wdt->prescaler = CDNS_WDT_PRESCALE_512;
 		wdt->ctrl_clksel = CDNS_WDT_PRESCALE_SELECT_512;
 	} else {
@@ -329,8 +333,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;
 
 	wdt->regs = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(wdt->regs))
Signature · 1 line
2.17.2
#5 lore raw

PATCH v3 3/4 watchdog: cadence_wdt: Group struct member init statements

In reply to Melin Tomas

Move 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
index a0d7666e7d20..0bdb275d904a 100644
@@ -330,6 +330,7 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 	}
 
 	cdns_wdt_device = &wdt->cdns_wdt_device;
+	cdns_wdt_device->parent = dev;
 	cdns_wdt_device->info = &cdns_wdt_info;
 	cdns_wdt_device->ops = &cdns_wdt_ops;
 	cdns_wdt_device->timeout = CDNS_WDT_DEFAULT_TIMEOUT;
@@ -356,9 +357,6 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 		}
 	}
 
-	/* Initialize the members of cdns_wdt structure */
-	cdns_wdt_device->parent = dev;
-
 	watchdog_init_timeout(cdns_wdt_device, wdt_timeout, dev);
 	watchdog_set_nowayout(cdns_wdt_device, nowayout);
 	watchdog_stop_on_reboot(cdns_wdt_device);
Signature · 1 line
2.17.2
maintainer Reviewed-by on v3 3/4
#6 lore raw

Re: [PATCH v3 3/4] watchdog: cadence_wdt: Group struct member init statements

Quoted 3 lines · Melin Tomas

Move init statement and remove stray comment.

Quoted 29 lines
---
 drivers/watchdog/cadence_wdt.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/watchdog/cadence_wdt.c +1 -3
index a0d7666e7d20..0bdb275d904a 100644
@@ -330,6 +330,7 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 	}
 
 	cdns_wdt_device = &wdt->cdns_wdt_device;
+	cdns_wdt_device->parent = dev;
 	cdns_wdt_device->info = &cdns_wdt_info;
 	cdns_wdt_device->ops = &cdns_wdt_ops;
 	cdns_wdt_device->timeout = CDNS_WDT_DEFAULT_TIMEOUT;
@@ -356,9 +357,6 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 		}
 	}
 
-	/* Initialize the members of cdns_wdt structure */
-	cdns_wdt_device->parent = dev;
-
 	watchdog_init_timeout(cdns_wdt_device, wdt_timeout, dev);
 	watchdog_set_nowayout(cdns_wdt_device, nowayout);
 	watchdog_stop_on_reboot(cdns_wdt_device);
Signature · 1 line
2.17.2
#7 lore raw

PATCH v3 4/4 watchdog: cadence_wdt: Support all available prescaler values

In reply to 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.

---
 drivers/watchdog/cadence_wdt.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/watchdog/cadence_wdt.c +15 -6
index 0bdb275d904a..037faf557f9d 100644
@@ -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
@@ -318,10 +319,18 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 		return ret;
 
 	clock_f = clk_get_rate(wdt->clk);
-	if (clock_f == 0) {
-		dev_err(dev, "invalid clock frequency, (f=%lu)\n", clock_f);
+	if (clock_f < CDNS_WDT_CLK_32KHZ) {
+		dev_err(dev,
+			"cannot find suitable clock prescaler, (f=%lu)\n",
+			clock_f);
 		return -EINVAL;
-	} else if (clock_f <= CDNS_WDT_CLK_75MHZ) {
+	} 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
maintainer
#8 lore raw
Quoted 10 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.

I think I am missing something. Why was this valid/supported up to now, and if it was, why is it no longer possible to support it ?

I am also a bit confused about the logic. With a slower clock, I would expect that the timeouts are getting larger, not smaller. Can you explain ?

Quoted 17 lines
---
 drivers/watchdog/cadence_wdt.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/watchdog/cadence_wdt.c +1 -0
index 0bdb275d904a..037faf557f9d 100644
@@ -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

drivers/watchdog/cadence_wdt.c line 46

Quoted 10 lines
drivers/watchdog/cadence_wdt.c +3 -3
+#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

^ Please use a tab here

Quoted 28 lines
drivers/watchdog/cadence_wdt.c +11 -3
 /* Counter maximum value */
 #define CDNS_WDT_COUNTER_MAX 0xFFF
@@ -318,10 +319,18 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 		return ret;
 
 	clock_f = clk_get_rate(wdt->clk);
-	if (clock_f == 0) {
-		dev_err(dev, "invalid clock frequency, (f=%lu)\n", clock_f);
+	if (clock_f < CDNS_WDT_CLK_32KHZ) {
+		dev_err(dev,
+			"cannot find suitable clock prescaler, (f=%lu)\n",
+			clock_f);
 		return -EINVAL;
-	} else if (clock_f <= CDNS_WDT_CLK_75MHZ) {
+	} 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
#9 lore raw
Quoted 7 lines · Guenter Roeck
Quoted 6 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.

Quoted 6 lines
Quoted 4 lines

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.

I think I am missing something. Why was this valid/supported up to now, and if it was, why is it no longer possible to support it ?

This driver hasn't really supported smaller input clock frequencies. The watchdog

can be driven from an internal clock with rather high frequency, which

I think is the default setting. So typically, one might not even use the smaller prescalers.

Quoted 3 lines

I am also a bit confused about the logic. With a slower clock, I would expect that the timeouts are getting larger, not smaller. Can you explain ?

Yes, that is correct. So with a 32kHz clock using smallest available prescaler,

we get 1 second resolution (and 1 second as smallest timeout).

With an even slower clock than that, we would end up with granularity

and smallest value larger than 1 second.

Thanks,

Tomas

Quoted 58 lines
Quoted 18 lines
---
  drivers/watchdog/cadence_wdt.c | 21 +++++++++++++++------
  1 file changed, 15 insertions(+), 6 deletions(-)
drivers/watchdog/cadence_wdt.c +1 -0
index 0bdb275d904a..037faf557f9d 100644
@@ -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

drivers/watchdog/cadence_wdt.c line 46

Quoted 10 lines
drivers/watchdog/cadence_wdt.c +3 -3
+#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

^ Please use a tab here

Quoted 28 lines
drivers/watchdog/cadence_wdt.c +11 -3
  /* Counter maximum value */
  #define CDNS_WDT_COUNTER_MAX 0xFFF
@@ -318,10 +319,18 @@ static int cdns_wdt_probe(struct platform_device *pdev)
  		return ret;
 
  	clock_f = clk_get_rate(wdt->clk);
-	if (clock_f == 0) {
-		dev_err(dev, "invalid clock frequency, (f=%lu)\n", clock_f);
+	if (clock_f < CDNS_WDT_CLK_32KHZ) {
+		dev_err(dev,
+			"cannot find suitable clock prescaler, (f=%lu)\n",
+			clock_f);
  		return -EINVAL;
-	} else if (clock_f <= CDNS_WDT_CLK_75MHZ) {
+	} 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
maintainer
#10 lore raw
Quoted 28 lines · Melin Tomas
Quoted 7 lines · Guenter Roeck
Quoted 6 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.

Quoted 6 lines
Quoted 4 lines

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.

I think I am missing something. Why was this valid/supported up to now, and if it was, why is it no longer possible to support it ?

This driver hasn't really supported smaller input clock frequencies. The watchdog

can be driven from an internal clock with rather high frequency, which

I think is the default setting. So typically, one might not even use the smaller prescalers.

Quoted 3 lines

I am also a bit confused about the logic. With a slower clock, I would expect that the timeouts are getting larger, not smaller. Can you explain ?

Quoted 9 lines

Yes, that is correct. So with a 32kHz clock using smallest available prescaler,

we get 1 second resolution (and 1 second as smallest timeout).

With an even slower clock than that, we would end up with granularity

and smallest value larger than 1 second.

Ah, we are talking about the _smallest_ timeout and about resolution. But that is no reason to declare the clock invalid. Just set the minimum to the actual minimum. There is no reason to reject slow clocks entirely, even if the granularity is in the multi-second range. The only caveat, if granularity is more than one second, is that the set_timeout function must select and report the actual timeout.

Thanks,
Guenter

Quoted 63 lines

Thanks,

Tomas

Quoted 58 lines
Quoted 18 lines
---
  drivers/watchdog/cadence_wdt.c | 21 +++++++++++++++------
  1 file changed, 15 insertions(+), 6 deletions(-)
drivers/watchdog/cadence_wdt.c +1 -0
index 0bdb275d904a..037faf557f9d 100644
@@ -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

drivers/watchdog/cadence_wdt.c line 46

Quoted 10 lines
drivers/watchdog/cadence_wdt.c +3 -3
+#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

^ Please use a tab here

Quoted 28 lines
drivers/watchdog/cadence_wdt.c +11 -3
  /* Counter maximum value */
  #define CDNS_WDT_COUNTER_MAX 0xFFF
@@ -318,10 +319,18 @@ static int cdns_wdt_probe(struct platform_device *pdev)
  		return ret;
 
  	clock_f = clk_get_rate(wdt->clk);
-	if (clock_f == 0) {
-		dev_err(dev, "invalid clock frequency, (f=%lu)\n", clock_f);
+	if (clock_f < CDNS_WDT_CLK_32KHZ) {
+		dev_err(dev,
+			"cannot find suitable clock prescaler, (f=%lu)\n",
+			clock_f);
  		return -EINVAL;
-	} else if (clock_f <= CDNS_WDT_CLK_75MHZ) {
+	} 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
#11 lore raw
Quoted 6 lines · Guenter Roeck

Ah, we are talking about the _smallest_ timeout and about resolution. But that is no reason to declare the clock invalid. Just set the minimum to the actual minimum. There is no reason to reject slow clocks entirely, even if the granularity is in the multi-second range. The only caveat, if granularity is more than one second, is that the set_timeout function must select and report the actual timeout.

I did consider supporting slower clocks but thought that the required

additional logic was perhaps not worth it. So instead just declared

those clock frequencies invalid.

However, if that logic is required, sure I can try to implement it.

It might take some weeks before I have time to look at it properly.

Thanks,

Tomas

Quoted 65 lines

Thanks,
Guenter

Quoted 61 lines

Thanks,

Tomas

Quoted 57 lines
Quoted 17 lines
---
   drivers/watchdog/cadence_wdt.c | 21 +++++++++++++++------
   1 file changed, 15 insertions(+), 6 deletions(-)
drivers/watchdog/cadence_wdt.c +1 -0
index 0bdb275d904a..037faf557f9d 100644
@@ -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

drivers/watchdog/cadence_wdt.c line 46

Quoted 10 lines
drivers/watchdog/cadence_wdt.c +3 -3
+#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

^ Please use a tab here

Quoted 28 lines
drivers/watchdog/cadence_wdt.c +11 -3
   /* Counter maximum value */
   #define CDNS_WDT_COUNTER_MAX 0xFFF
@@ -318,10 +319,18 @@ static int cdns_wdt_probe(struct platform_device *pdev)
   		return ret;
 
   	clock_f = clk_get_rate(wdt->clk);
-	if (clock_f == 0) {
-		dev_err(dev, "invalid clock frequency, (f=%lu)\n", clock_f);
+	if (clock_f < CDNS_WDT_CLK_32KHZ) {
+		dev_err(dev,
+			"cannot find suitable clock prescaler, (f=%lu)\n",
+			clock_f);
   		return -EINVAL;
-	} else if (clock_f <= CDNS_WDT_CLK_75MHZ) {
+	} 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
maintainer
#12 lore raw
Quoted 9 lines · Melin Tomas
Quoted 6 lines · Guenter Roeck

Ah, we are talking about the _smallest_ timeout and about resolution. But that is no reason to declare the clock invalid. Just set the minimum to the actual minimum. There is no reason to reject slow clocks entirely, even if the granularity is in the multi-second range. The only caveat, if granularity is more than one second, is that the set_timeout function must select and report the actual timeout.

Quoted 6 lines

I did consider supporting slower clocks but thought that the required

additional logic was perhaps not worth it. So instead just declared

those clock frequencies invalid.

Hmm ... not sure I understand. What makes it so difficult ?

Guenter

Quoted 74 lines

However, if that logic is required, sure I can try to implement it.

It might take some weeks before I have time to look at it properly.

Thanks,

Tomas

Quoted 65 lines

Thanks,
Guenter

Quoted 61 lines

Thanks,

Tomas

Quoted 57 lines
Quoted 17 lines
---
   drivers/watchdog/cadence_wdt.c | 21 +++++++++++++++------
   1 file changed, 15 insertions(+), 6 deletions(-)
drivers/watchdog/cadence_wdt.c +1 -0
index 0bdb275d904a..037faf557f9d 100644
@@ -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

drivers/watchdog/cadence_wdt.c line 46

Quoted 10 lines
drivers/watchdog/cadence_wdt.c +3 -3
+#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

^ Please use a tab here

Quoted 28 lines
drivers/watchdog/cadence_wdt.c +11 -3
   /* Counter maximum value */
   #define CDNS_WDT_COUNTER_MAX 0xFFF
@@ -318,10 +319,18 @@ static int cdns_wdt_probe(struct platform_device *pdev)
   		return ret;
 
   	clock_f = clk_get_rate(wdt->clk);
-	if (clock_f == 0) {
-		dev_err(dev, "invalid clock frequency, (f=%lu)\n", clock_f);
+	if (clock_f < CDNS_WDT_CLK_32KHZ) {
+		dev_err(dev,
+			"cannot find suitable clock prescaler, (f=%lu)\n",
+			clock_f);
   		return -EINVAL;
-	} else if (clock_f <= CDNS_WDT_CLK_75MHZ) {
+	} 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
#13 lore raw
Quoted 8 lines · Guenter Roeck
Quoted 7 lines · Melin Tomas
Quoted 6 lines · Guenter Roeck

Ah, we are talking about the _smallest_ timeout and about resolution. But that is no reason to declare the clock invalid. Just set the minimum to the actual minimum. There is no reason to reject slow clocks entirely, even if the granularity is in the multi-second range. The only caveat, if granularity is more than one second, is that the set_timeout function must select and report the actual timeout.

Quoted 7 lines
Quoted 6 lines

I did consider supporting slower clocks but thought that the required

additional logic was perhaps not worth it. So instead just declared

those clock frequencies invalid.

Hmm ... not sure I understand. What makes it so difficult ?

Not necessarily difficult, just additional logic for

the set_timeout caveat.

Thanks,

Tomas

Quoted 76 lines

Guenter

Quoted 73 lines

However, if that logic is required, sure I can try to implement it.

It might take some weeks before I have time to look at it properly.

Thanks,

Tomas

Quoted 64 lines

Thanks,
Guenter

Quoted 61 lines

Thanks,

Tomas

Quoted 57 lines
Quoted 17 lines
---
    drivers/watchdog/cadence_wdt.c | 21 +++++++++++++++------
    1 file changed, 15 insertions(+), 6 deletions(-)
drivers/watchdog/cadence_wdt.c +1 -0
index 0bdb275d904a..037faf557f9d 100644
@@ -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

drivers/watchdog/cadence_wdt.c line 46

Quoted 10 lines
drivers/watchdog/cadence_wdt.c +3 -3
+#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

^ Please use a tab here

Quoted 28 lines
drivers/watchdog/cadence_wdt.c +11 -3
    /* Counter maximum value */
    #define CDNS_WDT_COUNTER_MAX 0xFFF
@@ -318,10 +319,18 @@ static int cdns_wdt_probe(struct platform_device *pdev)
    		return ret;
 
    	clock_f = clk_get_rate(wdt->clk);
-	if (clock_f == 0) {
-		dev_err(dev, "invalid clock frequency, (f=%lu)\n", clock_f);
+	if (clock_f < CDNS_WDT_CLK_32KHZ) {
+		dev_err(dev,
+			"cannot find suitable clock prescaler, (f=%lu)\n",
+			clock_f);
    		return -EINVAL;
-	} else if (clock_f <= CDNS_WDT_CLK_75MHZ) {
+	} 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