Skip to contentSkip to conversation

watchdog: sama5d4: make use of timeout-secs provided in devicetree

PATCH Superseded Marcus Folkesson 5 participants 16 messages Feb 10, 2018 – Feb 22, 2018

Subsystems (7)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/7 watchdog: sama5d4: make use of timeout-secs provided in devicetree

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

Following best practice described in Documentation/watchdog/watchdog-kernel-api.txt to make use of the parameter logic.

---
 drivers/watchdog/sama5d4_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/sama5d4_wdt.c +2 -2
index 0ae947c3d7bc..e6c679383734 100644
@@ -33,7 +33,7 @@ struct sama5d4_wdt {
 	unsigned long		last_ping;
 };
 
-static int wdt_timeout = WDT_DEFAULT_TIMEOUT;
+static int wdt_timeout;
 static bool nowayout = WATCHDOG_NOWAYOUT;
 
 module_param(wdt_timeout, int, 0);
@@ -212,7 +212,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	wdd = &wdt->wdd;
-	wdd->timeout = wdt_timeout;
+	wdd->timeout = WDT_DEFAULT_TIMEOUT;
 	wdd->info = &sama5d4_wdt_info;
 	wdd->ops = &sama5d4_wdt_ops;
 	wdd->min_timeout = MIN_WDT_TIMEOUT;
Signature · 1 line
2.15.1
#1 lore raw

PATCH v2 2/7 watchdog: sunxi: allow setting timeout in devicetree

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

By following best practice described in Documentation/watchdog/watchdog-kernel-api.txt, it also let us to set timout-sec property in devicetree.

---
 Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 4 ++++
 drivers/watchdog/sunxi_wdt.c                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +4 -0
index 62dd5baad70e..49900e72f6b1 100644
@@ -6,9 +6,13 @@ Required properties:
                "allwinner,sun6i-a31-wdt"
 - reg : Specifies base physical address and size of the registers.
 
+Optional properties:
+- timeout-sec : Contains the watchdog timeout in seconds
+
 Example:
 
 wdt: watchdog at 1c20c90 {
 	compatible = "allwinner,sun4i-a10-wdt";
 	reg = <0x01c20c90 0x10>;
+	timeout-sec = <10>;
 };
drivers/watchdog/sunxi_wdt.c +1 -1
index 9728fa32c357..55f166bec0ca 100644
@@ -39,7 +39,7 @@
 #define DRV_VERSION		"1.0"
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = WDT_MAX_TIMEOUT;
+static unsigned int timeout;
 
 /*
  * This structure stores the register offsets for different variants
Signature · 1 line
2.15.1
#2 lore raw

PATCH v2 3/7 watchdog: sirfsoc: allow setting timeout in devicetree

In reply to Marcus Folkesson

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

By following best practice described in Documentation/watchdog/watchdog-kernel-api.txt, it also let us to set timout-sec property in devicetree.

---
 Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt | 4 ++++
 drivers/watchdog/sirfsoc_wdt.c                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt +4 -0
index 9cbc76c89b2b..0dce5e3100b4 100644
@@ -5,10 +5,14 @@ Required properties:
 - reg: Address range of tick timer/WDT register set
 - interrupts: interrupt number to the cpu
 
+Optional properties:
+- timeout-sec : Contains the watchdog timeout in seconds
+
 Example:
 
 timer at b0020000 {
 	compatible = "sirf,prima2-tick";
 	reg = <0xb0020000 0x1000>;
 	interrupts = <0>;
+	timeout-sec = <30>;
 };
drivers/watchdog/sirfsoc_wdt.c +1 -1
index 4eea351e09b0..ac0c9d2c4aee 100644
@@ -29,7 +29,7 @@
 #define SIRFSOC_WDT_MAX_TIMEOUT		(10 * 60)	/* 10 mins */
 #define SIRFSOC_WDT_DEFAULT_TIMEOUT	30		/* 30 secs */
 
-static unsigned int timeout = SIRFSOC_WDT_DEFAULT_TIMEOUT;
+static unsigned int timeout;
 static bool nowayout = WATCHDOG_NOWAYOUT;
 
 module_param(timeout, uint, 0);
Signature · 1 line
2.15.1
#3 lore raw

PATCH v2 4/7 watchdog: pnx4008: make use of timeout-secs provided in devicetree

In reply to Marcus Folkesson

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

Following best practice described in Documentation/watchdog/watchdog-kernel-api.txt to make use of the parameter logic.

---
 drivers/watchdog/pnx4008_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/pnx4008_wdt.c +1 -1
index 0529aed158a4..8e261799c84e 100644
@@ -78,7 +78,7 @@
 #define WDOG_COUNTER_RATE 13000000	/*the counter clock is 13 MHz fixed */
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int heartbeat = DEFAULT_HEARTBEAT;
+static unsigned int heartbeat;
 
 static DEFINE_SPINLOCK(io_lock);
 static void __iomem	*wdt_base;
Signature · 1 line
2.15.1
#4 lore raw

PATCH v2 5/7 watchdog: mtk: allow setting timeout in devicetree

In reply to Marcus Folkesson

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

By following best practice described in Documentation/watchdog/watchdog-kernel-api.txt, it also let us to set timout-sec property in devicetree.

---
 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 4 ++++
 drivers/watchdog/mtk_wdt.c                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +4 -0
index 5b38a30e608c..859dee167b91 100644
@@ -11,9 +11,13 @@ Required properties:
 
 - reg : Specifies base physical address and size of the registers.
 
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
 Example:
 
 wdt: watchdog at 10000000 {
 	compatible = "mediatek,mt6589-wdt";
 	reg = <0x10000000 0x18>;
+	timeout-sec = <10>;
 };
drivers/watchdog/mtk_wdt.c +1 -1
index 7ed417a765c7..fcdc10ec28a3 100644
@@ -57,7 +57,7 @@
 #define DRV_VERSION		"1.0"
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = WDT_MAX_TIMEOUT;
+static unsigned int timeout;
 
 struct mtk_wdt_dev {
 	struct watchdog_device wdt_dev;
Signature · 1 line
2.15.1
#5 lore raw

Re: [PATCH v2 5/7] watchdog: mtk: allow setting timeout in devicetree

Hi, Marcus

The changes you made for dt-bindings and driver should be put into separate patches.

And the property timeout-sec seems to be generic enough to all devices, so why not add a common document to describe it and allow those devices to refer to, like other dt-bindings for other kinds of devices usually did.

Sean

Quoted 45 lines · Marcus Folkesson

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

By following best practice described in Documentation/watchdog/watchdog-kernel-api.txt, it also let us to set timout-sec property in devicetree.

---
 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 4 ++++
 drivers/watchdog/mtk_wdt.c                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +4 -0
index 5b38a30e608c..859dee167b91 100644
@@ -11,9 +11,13 @@ Required properties:
 
 - reg : Specifies base physical address and size of the registers.
 
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
 Example:
 
 wdt: watchdog at 10000000 {
 	compatible = "mediatek,mt6589-wdt";
 	reg = <0x10000000 0x18>;
+	timeout-sec = <10>;
 };
drivers/watchdog/mtk_wdt.c +1 -1
index 7ed417a765c7..fcdc10ec28a3 100644
@@ -57,7 +57,7 @@
 #define DRV_VERSION		"1.0"
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = WDT_MAX_TIMEOUT;
+static unsigned int timeout;
 
 struct mtk_wdt_dev {
 	struct watchdog_device wdt_dev;
#6 lore raw

Re: [PATCH v2 5/7] watchdog: mtk: allow setting timeout in devicetree

Hello Sean,

Quoted 5 lines · Sean Wang

Hi, Marcus

The changes you made for dt-bindings and driver should be put into separate patches.

I actually thought about it but chose to have it in the same patch because I did not see any direct advantage to separating them.

But I can do that.
I will come up with a v3 with this change if no one thinks differently.

Quoted 5 lines

And the property timeout-sec seems to be generic enough to all devices, so why not add a common document to describe it and allow those devices to refer to, like other dt-bindings for other kinds of devices usually did.

It should be, but it requires that the driver is using watchdog_init_timeout() to set timeout, most of the drivers does not. Most drivers does not even use the watchdog API but register itself as misc devices.

When we have all wdt drivers using the watchdog API, we should probably move the dt-binding to a common document.

Quoted 3 lines

Sean

Thanks,

Best regards
Marcus Folkesson

Quoted 40 lines · Marcus Folkesson
Quoted 39 lines

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

By following best practice described in Documentation/watchdog/watchdog-kernel-api.txt, it also let us to set timout-sec property in devicetree.

---
 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 4 ++++
 drivers/watchdog/mtk_wdt.c                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +4 -0
index 5b38a30e608c..859dee167b91 100644
@@ -11,9 +11,13 @@ Required properties:
 
 - reg : Specifies base physical address and size of the registers.
 
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
 Example:
 
 wdt: watchdog at 10000000 {
 	compatible = "mediatek,mt6589-wdt";
 	reg = <0x10000000 0x18>;
+	timeout-sec = <10>;
 };
drivers/watchdog/mtk_wdt.c +0 -0
index 7ed417a765c7..fcdc10ec28a3 100644
@@ -57,7 +57,7 @@
 #define DRV_VERSION		"1.0"
 
Quoted 8 lines

drivers/watchdog/mtk_wdt.c line 63

Quoted 6 lines
drivers/watchdog/mtk_wdt.c +1 -1
 static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = WDT_MAX_TIMEOUT;
+static unsigned int timeout;
 
 struct mtk_wdt_dev {
 	struct watchdog_device wdt_dev;

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20180210/cefed802/attachment.sig>

#7 lore raw

Re: [PATCH v2 5/7] watchdog: mtk: allow setting timeout in devicetree

Hello Sean,

Quoted 6 lines · Marcus Folkesson

Hello Sean,

Quoted 3 lines · Sean Wang

Hi, Marcus

Quoted 9 lines
Quoted 2 lines

The changes you made for dt-bindings and driver should be put into separate patches.

I actually thought about it but chose to have it in the same patch because I did not see any direct advantage to separating them.

But I can do that.
I will come up with a v3 with this change if no one thinks differently.

When looking at the git log, I'm not that convinced it should be separate patches.

For example, I found a4f741e3e157c3a5c8aea5f2ea62b692fbf17338 that is doing the exact same thing as this patch.

There is plenty of patches that mixes the code change and dt bindings updates.
Could it not be useful to overview both the implementation and dt-mapping change in one view?

If you or anyone else still think it should be separated, please let me know and I will come up with a v3.

Quoted 15 lines
Quoted 5 lines

And the property timeout-sec seems to be generic enough to all devices, so why not add a common document to describe it and allow those devices to refer to, like other dt-bindings for other kinds of devices usually did.

It should be, but it requires that the driver is using watchdog_init_timeout() to set timeout, most of the drivers does not. Most drivers does not even use the watchdog API but register itself as misc devices.

When we have all wdt drivers using the watchdog API, we should probably move the dt-binding to a common document.

Quoted 1 line
Quoted 56 lines
Quoted 2 lines

Sean

Thanks,

Best regards
Marcus Folkesson

Quoted 48 lines · Marcus Folkesson
Quoted 45 lines

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

By following best practice described in Documentation/watchdog/watchdog-kernel-api.txt, it also let us to set timout-sec property in devicetree.

---
 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 4 ++++
 drivers/watchdog/mtk_wdt.c                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +4 -0
index 5b38a30e608c..859dee167b91 100644
@@ -11,9 +11,13 @@ Required properties:
 
 - reg : Specifies base physical address and size of the registers.
 
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
 Example:
 
 wdt: watchdog at 10000000 {
 	compatible = "mediatek,mt6589-wdt";
 	reg = <0x10000000 0x18>;
+	timeout-sec = <10>;
 };
drivers/watchdog/mtk_wdt.c +1 -1
index 7ed417a765c7..fcdc10ec28a3 100644
@@ -57,7 +57,7 @@
 #define DRV_VERSION		"1.0"
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = WDT_MAX_TIMEOUT;
+static unsigned int timeout;
 
 struct mtk_wdt_dev {
 	struct watchdog_device wdt_dev;

Best regards
Marcus Folkesson

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20180210/cb6c907b/attachment.sig>

maintainer
#8 lore raw

Re: [PATCH v2 5/7] watchdog: mtk: allow setting timeout in devicetree

Quoted 25 lines · Marcus Folkesson

Hello Sean,

Quoted 6 lines · Marcus Folkesson

Hello Sean,

Quoted 3 lines · Sean Wang

Hi, Marcus

Quoted 9 lines
Quoted 2 lines

The changes you made for dt-bindings and driver should be put into separate patches.

I actually thought about it but chose to have it in the same patch because I did not see any direct advantage to separating them.

But I can do that.
I will come up with a v3 with this change if no one thinks differently.

When looking at the git log, I'm not that convinced it should be separate patches.

For example, I found a4f741e3e157c3a5c8aea5f2ea62b692fbf17338 that is doing the exact same thing as this patch.

Quoted 8 lines

There is plenty of patches that mixes the code change and dt bindings updates.
Could it not be useful to overview both the implementation and dt-mapping change in one view?

If you or anyone else still think it should be separated, please let me know and I will come up with a v3.

If we were talking about something new, specifically new and unapproved DT bindings, it should be separate patches. However, that is not the case here. The DT bindings are well established. Sure, we could be pedantic and request a split into two patches. However, the only benefit of that would be more work for the maintainers, ie Wim and myself (including me having to send this e-mail). I don't really see the point of that.

I have already sent my Reviewed-by:, and I don't intend to withdraw it.

Thanks,
Guenter

#9 lore raw

Re: [PATCH v2 5/7] watchdog: mtk: allow setting timeout in devicetree

Quoted 35 lines · Guenter Roeck
Quoted 25 lines · Marcus Folkesson

Hello Sean,

Quoted 6 lines · Marcus Folkesson

Hello Sean,

Quoted 3 lines · Sean Wang

Hi, Marcus

Quoted 9 lines
Quoted 2 lines

The changes you made for dt-bindings and driver should be put into separate patches.

I actually thought about it but chose to have it in the same patch because I did not see any direct advantage to separating them.

But I can do that.
I will come up with a v3 with this change if no one thinks differently.

When looking at the git log, I'm not that convinced it should be separate patches.

For example, I found a4f741e3e157c3a5c8aea5f2ea62b692fbf17338 that is doing the exact same thing as this patch.

Quoted 8 lines

There is plenty of patches that mixes the code change and dt bindings updates.
Could it not be useful to overview both the implementation and dt-mapping change in one view?

If you or anyone else still think it should be separated, please let me know and I will come up with a v3.

Quoted 9 lines

If we were talking about something new, specifically new and unapproved DT bindings, it should be separate patches. However, that is not the case here. The DT bindings are well established. Sure, we could be pedantic and request a split into two patches. However, the only benefit of that would be more work for the maintainers, ie Wim and myself (including me having to send this e-mail). I don't really see the point of that.

I have already sent my Reviewed-by:, and I don't intend to withdraw it.

Hi, both

Sorry for that if I caused any inconvenience to you. I didn't really insist on if the patch is needed to split into two, which totally depends on whether dt maintainers like it.

The change for dt-binding is usually added as a split patch with dt-bindings as a prefix. This way I thought dt maintainers is not easy to miss those patches and also can give some useful feedback for them.

Sean

Quoted 3 lines

Thanks,
Guenter

maintainer
#10 lore raw

Re: [PATCH v2 5/7] watchdog: mtk: allow setting timeout in devicetree

Quoted 47 lines · Sean Wang
Quoted 35 lines · Guenter Roeck
Quoted 25 lines · Marcus Folkesson

Hello Sean,

Quoted 6 lines · Marcus Folkesson

Hello Sean,

Quoted 3 lines · Sean Wang

Hi, Marcus

Quoted 9 lines
Quoted 2 lines

The changes you made for dt-bindings and driver should be put into separate patches.

I actually thought about it but chose to have it in the same patch because I did not see any direct advantage to separating them.

But I can do that.
I will come up with a v3 with this change if no one thinks differently.

When looking at the git log, I'm not that convinced it should be separate patches.

For example, I found a4f741e3e157c3a5c8aea5f2ea62b692fbf17338 that is doing the exact same thing as this patch.

Quoted 8 lines

There is plenty of patches that mixes the code change and dt bindings updates.
Could it not be useful to overview both the implementation and dt-mapping change in one view?

If you or anyone else still think it should be separated, please let me know and I will come up with a v3.

Quoted 9 lines

If we were talking about something new, specifically new and unapproved DT bindings, it should be separate patches. However, that is not the case here. The DT bindings are well established. Sure, we could be pedantic and request a split into two patches. However, the only benefit of that would be more work for the maintainers, ie Wim and myself (including me having to send this e-mail). I don't really see the point of that.

I have already sent my Reviewed-by:, and I don't intend to withdraw it.

Hi, both

Quoted 9 lines

Sorry for that if I caused any inconvenience to you. I didn't really insist on if the patch is needed to split into two, which totally depends on whether dt maintainers like it.

The change for dt-binding is usually added as a split patch with dt-bindings as a prefix. This way I thought dt maintainers is not easy to miss those patches and also can give some useful feedback for them.

With all the trouble this one-line change is making, I feel inclined to drop the patch for this driver.

Guenter

#11 lore raw

PATCH v2 6/7 watchdog: meson: allow setting timeout in devicetree

In reply to Marcus Folkesson

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

By following best practice described in Documentation/watchdog/watchdog-kernel-api.txt, it also let us to set timout-sec property in devicetree.

---
 Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 4 ++++
 drivers/watchdog/meson_wdt.c                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/watchdog/meson-wdt.txt +4 -0
index 8a6d84cb36c9..7588cc3971bf 100644
@@ -9,9 +9,13 @@ Required properties:
 	"amlogic,meson8m2-wdt" and "amlogic,meson8b-wdt" on Meson8m2 SoCs
 - reg : Specifies base physical address and size of the registers.
 
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
 Example:
 
 wdt: watchdog at c1109900 {
 	compatible = "amlogic,meson6-wdt";
 	reg = <0xc1109900 0x8>;
+	timeout-sec = <10>;
 };
drivers/watchdog/meson_wdt.c +1 -1
index 304274c67735..cd0275a6cdac 100644
@@ -36,7 +36,7 @@
 #define MESON_SEC_TO_TC(s, c)	((s) * (c))
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = MESON_WDT_TIMEOUT;
+static unsigned int timeout;
 
 struct meson_wdt_data {
 	unsigned int enable;
Signature · 1 line
2.15.1
#12 lore raw

PATCH v2 7/7 watchdog: coh901327: make use of timeout-secs provided in devicetree

In reply to Marcus Folkesson

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

Following best practice described in Documentation/watchdog/watchdog-kernel-api.txt to make use of the parameter logic.

---

v2:
- Set .timeout in coh901327_wdt structure declaration.
- Set .min_timeout to 1 instead of 0. I could not find a datasheet for coh901327, so I'm not sure if 0 is valid. However, 0 seems wrong to me and most driver has 1 as min value. If it should be 0, please let me know and I have to set another initial value for margin.

 drivers/watchdog/coh901327_wdt.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/watchdog/coh901327_wdt.c +6 -5
index 4410337f4f7f..5d8eb9a30879 100644
@@ -67,7 +67,9 @@
 #define U300_WDOG_IFR_WILL_BARK_IRQ_FORCE_ENABLE			0x0001U
 
 /* Default timeout in seconds = 1 minute */
-static unsigned int margin = 60;
+#define U300_WDOG_DEFAULT_TIMEOUT					60
+
+static unsigned int margin;
 static int irq;
 static void __iomem *virtbase;
 static struct device *parent;
@@ -235,8 +237,9 @@ static struct watchdog_device coh901327_wdt = {
 	 * timeout register is max
 	 * 0x7FFF = 327670ms ~= 327s.
 	 */
-	.min_timeout = 0,
+	.min_timeout = 1,
 	.max_timeout = 327,
+	.timeout = U300_WDOG_DEFAULT_TIMEOUT,
 };
 
 static int __exit coh901327_remove(struct platform_device *pdev)
@@ -315,9 +318,7 @@ static int __init coh901327_probe(struct platform_device *pdev)
 		goto out_no_irq;
 	}
 
-	ret = watchdog_init_timeout(&coh901327_wdt, margin, dev);
-	if (ret < 0)
-		coh901327_wdt.timeout = 60;
+	watchdog_init_timeout(&coh901327_wdt, margin, dev);
 
 	coh901327_wdt.parent = dev;
 	ret = watchdog_register_device(&coh901327_wdt);
Signature · 1 line
2.15.1
maintainer
#13 lore raw

Re: [v2, 7/7] watchdog: coh901327: make use of timeout-secs provided in devicetree

Quoted 10 lines · Marcus Folkesson

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

Following best practice described in Documentation/watchdog/watchdog-kernel-api.txt to make use of the parameter logic.

---

Quoted 7 lines

v2:
- Set .timeout in coh901327_wdt structure declaration.
- Set .min_timeout to 1 instead of 0. I could not find a datasheet for coh901327, so I'm not sure if 0 is valid. However, 0 seems wrong to me and most driver has 1 as min value. If it should be 0, please let me know and I have to set another initial value for margin.

Makes sense to me.

Quoted 9 lines
 drivers/watchdog/coh901327_wdt.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/watchdog/coh901327_wdt.c +0 -0
index 4410337f4f7f..5d8eb9a30879 100644

drivers/watchdog/coh901327_wdt.c line 72

Quoted 7 lines
drivers/watchdog/coh901327_wdt.c +3 -1
@@ -67,7 +67,9 @@
 #define U300_WDOG_IFR_WILL_BARK_IRQ_FORCE_ENABLE			0x0001U
 
 /* Default timeout in seconds = 1 minute */
-static unsigned int margin = 60;
+#define U300_WDOG_DEFAULT_TIMEOUT					60
+
+static unsigned int margin;

I just realized that 'margin' instead of the actual timeout is used at the end of the probe function to display the selected timeout. This will have to change as well (and I'll have to go back to the other patches to make sure that this doesn't happen there as well).

Guenter

Quoted 25 lines
drivers/watchdog/coh901327_wdt.c +3 -4
 static int irq;
 static void __iomem *virtbase;
 static struct device *parent;
@@ -235,8 +237,9 @@ static struct watchdog_device coh901327_wdt = {
 	 * timeout register is max
 	 * 0x7FFF = 327670ms ~= 327s.
 	 */
-	.min_timeout = 0,
+	.min_timeout = 1,
 	.max_timeout = 327,
+	.timeout = U300_WDOG_DEFAULT_TIMEOUT,
 };
 
 static int __exit coh901327_remove(struct platform_device *pdev)
@@ -315,9 +318,7 @@ static int __init coh901327_probe(struct platform_device *pdev)
 		goto out_no_irq;
 	}
 
-	ret = watchdog_init_timeout(&coh901327_wdt, margin, dev);
-	if (ret < 0)
-		coh901327_wdt.timeout = 60;
+	watchdog_init_timeout(&coh901327_wdt, margin, dev);
 
 	coh901327_wdt.parent = dev;
 	ret = watchdog_register_device(&coh901327_wdt);
Reviewed-by on v2 7/7
#14 lore raw

Re: [PATCH v2 7/7] watchdog: coh901327: make use of timeout-secs provided in devicetree

In reply to Marcus Folkesson
Quoted 10 lines · Marcus Folkesson

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

Following best practice described in Documentation/watchdog/watchdog-kernel-api.txt to make use of the parameter logic.

---

Quoted 7 lines

v2:
- Set .timeout in coh901327_wdt structure declaration.
- Set .min_timeout to 1 instead of 0. I could not find a datasheet for coh901327, so I'm not sure if 0 is valid. However, 0 seems wrong to me and most driver has 1 as min value. If it should be 0, please let me know and I have to set another initial value for margin.

Yours,
Linus Walleij

Reviewed-by on v2 1/7
#15 lore raw
In reply to Marcus Folkesson
Quoted 9 lines · Marcus Folkesson

watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout.

Following best practice described in Documentation/watchdog/watchdog-kernel-api.txt to make use of the parameter logic.

Signature · 3 lines
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com