* [PATCH v3 3/7] watchdog: sirfsoc: allow setting timeout in devicetree
[not found] ` <20180211200847.25000-1-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2018-02-11 20:08 ` Marcus Folkesson
2018-02-19 0:07 ` Rob Herring
2018-02-11 20:08 ` [PATCH v3 6/7] watchdog: meson: " Marcus Folkesson
` (3 subsequent siblings)
4 siblings, 1 reply; 22+ messages in thread
From: Marcus Folkesson @ 2018-02-11 20:08 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Mark Rutland,
Carlo Caione, Kevin Hilman, Matthias Brugger, Barry Song,
Maxime Ripard, Chen-Yu Tsai, Linus Walleij, Vladimir Zapolskiy,
Sylvain Lemieux, Nicolas Ferre, Alexandre Belloni
Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
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.
Signed-off-by: Marcus Folkesson <marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
---
Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt | 4 ++++
drivers/watchdog/sirfsoc_wdt.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
index 9cbc76c89b2b..0dce5e3100b4 100644
--- a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
@@ -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@b0020000 {
compatible = "sirf,prima2-tick";
reg = <0xb0020000 0x1000>;
interrupts = <0>;
+ timeout-sec = <30>;
};
diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c
index 4eea351e09b0..ac0c9d2c4aee 100644
--- a/drivers/watchdog/sirfsoc_wdt.c
+++ b/drivers/watchdog/sirfsoc_wdt.c
@@ -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);
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v3 3/7] watchdog: sirfsoc: allow setting timeout in devicetree
2018-02-11 20:08 ` [PATCH v3 3/7] watchdog: sirfsoc: " Marcus Folkesson
@ 2018-02-19 0:07 ` Rob Herring
2018-02-19 1:07 ` Guenter Roeck
0 siblings, 1 reply; 22+ messages in thread
From: Rob Herring @ 2018-02-19 0:07 UTC (permalink / raw)
To: Marcus Folkesson
Cc: Mark Rutland, devicetree, Barry Song, linux-kernel,
linux-watchdog, Kevin Hilman, Linus Walleij, linux-mediatek,
Chen-Yu Tsai, Vladimir Zapolskiy, Matthias Brugger,
Wim Van Sebroeck, Alexandre Belloni, linux-arm-kernel,
Sylvain Lemieux, Carlo Caione, linux-amlogic, Maxime Ripard,
Guenter Roeck
On Sun, Feb 11, 2018 at 09:08:43PM +0100, Marcus Folkesson wrote:
> 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.
typo
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt | 4 ++++
> drivers/watchdog/sirfsoc_wdt.c | 2 +-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
> index 9cbc76c89b2b..0dce5e3100b4 100644
> --- a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
> +++ b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
> @@ -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@b0020000 {
> compatible = "sirf,prima2-tick";
> reg = <0xb0020000 0x1000>;
> interrupts = <0>;
> + timeout-sec = <30>;
> };
> diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c
> index 4eea351e09b0..ac0c9d2c4aee 100644
> --- a/drivers/watchdog/sirfsoc_wdt.c
> +++ b/drivers/watchdog/sirfsoc_wdt.c
> @@ -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;
If you have an old dtb, then you still need the default.
> static bool nowayout = WATCHDOG_NOWAYOUT;
>
> module_param(timeout, uint, 0);
> --
> 2.15.1
>
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v3 3/7] watchdog: sirfsoc: allow setting timeout in devicetree
2018-02-19 0:07 ` Rob Herring
@ 2018-02-19 1:07 ` Guenter Roeck
2018-02-22 0:02 ` Rob Herring
0 siblings, 1 reply; 22+ messages in thread
From: Guenter Roeck @ 2018-02-19 1:07 UTC (permalink / raw)
To: Rob Herring, Marcus Folkesson
Cc: Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, Barry Song,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA, Kevin Hilman,
Linus Walleij, Nicolas Ferre,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Chen-Yu Tsai,
Vladimir Zapolskiy, Matthias Brugger, Wim Van Sebroeck,
Alexandre Belloni, Sylvain Lemieux, Carlo Caione,
linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Maxime Ripard,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On 02/18/2018 04:07 PM, Rob Herring wrote:
> On Sun, Feb 11, 2018 at 09:08:43PM +0100, Marcus Folkesson wrote:
>> 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.
>
> typo
>
>>
>> Signed-off-by: Marcus Folkesson <marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
>> ---
>> Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt | 4 ++++
>> drivers/watchdog/sirfsoc_wdt.c | 2 +-
>> 2 files changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
>> index 9cbc76c89b2b..0dce5e3100b4 100644
>> --- a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
>> +++ b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
>> @@ -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@b0020000 {
>> compatible = "sirf,prima2-tick";
>> reg = <0xb0020000 0x1000>;
>> interrupts = <0>;
>> + timeout-sec = <30>;
>> };
>> diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c
>> index 4eea351e09b0..ac0c9d2c4aee 100644
>> --- a/drivers/watchdog/sirfsoc_wdt.c
>> +++ b/drivers/watchdog/sirfsoc_wdt.c
>> @@ -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;
>
> If you have an old dtb, then you still need the default.
>
No. It is optional to start with, and the driver already has
static struct watchdog_device sirfsoc_wdd = {
.info = &sirfsoc_wdt_ident,
.ops = &sirfsoc_wdt_ops,
.timeout = SIRFSOC_WDT_DEFAULT_TIMEOUT, <------
.min_timeout = SIRFSOC_WDT_MIN_TIMEOUT,
.max_timeout = SIRFSOC_WDT_MAX_TIMEOUT,
};
Guenter
>> static bool nowayout = WATCHDOG_NOWAYOUT;
>>
>> module_param(timeout, uint, 0);
>> --
>> 2.15.1
>>
>
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v3 3/7] watchdog: sirfsoc: allow setting timeout in devicetree
2018-02-19 1:07 ` Guenter Roeck
@ 2018-02-22 0:02 ` Rob Herring
0 siblings, 0 replies; 22+ messages in thread
From: Rob Herring @ 2018-02-22 0:02 UTC (permalink / raw)
To: Guenter Roeck, Marcus Folkesson
Cc: Mark Rutland, devicetree, Barry Song, linux-kernel,
LINUX-WATCHDOG, Kevin Hilman, Linus Walleij, linux-mediatek,
Chen-Yu Tsai, Vladimir Zapolskiy, Matthias Brugger,
Wim Van Sebroeck, Alexandre Belloni, Sylvain Lemieux,
Carlo Caione, linux-amlogic, Maxime Ripard,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Sun, Feb 18, 2018 at 7:07 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> On 02/18/2018 04:07 PM, Rob Herring wrote:
>>
>> On Sun, Feb 11, 2018 at 09:08:43PM +0100, Marcus Folkesson wrote:
>>>
>>> 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.
>>
>>
>> typo
>>
>>>
>>> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
>>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>> ---
>>> Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt | 4 ++++
>>> drivers/watchdog/sirfsoc_wdt.c | 2 +-
>>> 2 files changed, 5 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
>>> b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
>>> index 9cbc76c89b2b..0dce5e3100b4 100644
>>> --- a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
>>> +++ b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
>>> @@ -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@b0020000 {
>>> compatible = "sirf,prima2-tick";
>>> reg = <0xb0020000 0x1000>;
>>> interrupts = <0>;
>>> + timeout-sec = <30>;
>>> };
>>> diff --git a/drivers/watchdog/sirfsoc_wdt.c
>>> b/drivers/watchdog/sirfsoc_wdt.c
>>> index 4eea351e09b0..ac0c9d2c4aee 100644
>>> --- a/drivers/watchdog/sirfsoc_wdt.c
>>> +++ b/drivers/watchdog/sirfsoc_wdt.c
>>> @@ -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;
>>
>>
>> If you have an old dtb, then you still need the default.
>>
>
> No. It is optional to start with, and the driver already has
>
> static struct watchdog_device sirfsoc_wdd = {
> .info = &sirfsoc_wdt_ident,
> .ops = &sirfsoc_wdt_ops,
> .timeout = SIRFSOC_WDT_DEFAULT_TIMEOUT, <------
> .min_timeout = SIRFSOC_WDT_MIN_TIMEOUT,
> .max_timeout = SIRFSOC_WDT_MAX_TIMEOUT,
> };
Okay, then:
Reviewed-by: Rob Herring <robh@kernel.org>
for the lot.
Rob
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v3 6/7] watchdog: meson: allow setting timeout in devicetree
[not found] ` <20180211200847.25000-1-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-02-11 20:08 ` [PATCH v3 3/7] watchdog: sirfsoc: " Marcus Folkesson
@ 2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided " Marcus Folkesson
` (2 subsequent siblings)
4 siblings, 0 replies; 22+ messages in thread
From: Marcus Folkesson @ 2018-02-11 20:08 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Mark Rutland,
Carlo Caione, Kevin Hilman, Matthias Brugger, Barry Song,
Maxime Ripard, Chen-Yu Tsai, Linus Walleij, Vladimir Zapolskiy,
Sylvain Lemieux, Nicolas Ferre, Alexandre Belloni
Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
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.
Signed-off-by: Marcus Folkesson <marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
---
Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 4 ++++
drivers/watchdog/meson_wdt.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
index 8a6d84cb36c9..7588cc3971bf 100644
--- a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt
@@ -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@c1109900 {
compatible = "amlogic,meson6-wdt";
reg = <0xc1109900 0x8>;
+ timeout-sec = <10>;
};
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index 304274c67735..cd0275a6cdac 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -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;
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided in devicetree
[not found] ` <20180211200847.25000-1-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-02-11 20:08 ` [PATCH v3 3/7] watchdog: sirfsoc: " Marcus Folkesson
2018-02-11 20:08 ` [PATCH v3 6/7] watchdog: meson: " Marcus Folkesson
@ 2018-02-11 20:08 ` Marcus Folkesson
[not found] ` <20180211200847.25000-7-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-02-22 14:01 ` [PATCH v3 " Linus Walleij
2018-02-12 1:10 ` [v3, 1/7] watchdog: sama5d4: " Guenter Roeck
2018-02-12 8:59 ` [PATCH v3 " Nicolas Ferre
4 siblings, 2 replies; 22+ messages in thread
From: Marcus Folkesson @ 2018-02-11 20:08 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Rob Herring, Mark Rutland,
Carlo Caione, Kevin Hilman, Matthias Brugger, Barry Song,
Maxime Ripard, Chen-Yu Tsai, Linus Walleij, Vladimir Zapolskiy,
Sylvain Lemieux, Nicolas Ferre, Alexandre Belloni
Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
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.
Signed-off-by: Marcus Folkesson <marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
Notes:
v3:
- Reformat and use coh901327_wdt.timeout instead of margin when print out
timout in probe function.
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 | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c
index 4410337f4f7f..500af8a7ec5a 100644
--- a/drivers/watchdog/coh901327_wdt.c
+++ b/drivers/watchdog/coh901327_wdt.c
@@ -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,16 +318,15 @@ 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);
if (ret)
goto out_no_wdog;
- dev_info(dev, "initialized. timer margin=%d sec\n", margin);
+ dev_info(dev, "initialized. (timeout=%d sec)\n",
+ coh901327_wdt.timeout);
return 0;
out_no_wdog:
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 22+ messages in thread[parent not found: <20180211200847.25000-7-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [v3, 7/7] watchdog: coh901327: make use of timeout-secs provided in devicetree
[not found] ` <20180211200847.25000-7-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2018-02-12 1:11 ` Guenter Roeck
0 siblings, 0 replies; 22+ messages in thread
From: Guenter Roeck @ 2018-02-12 1:11 UTC (permalink / raw)
To: Marcus Folkesson
Cc: Wim Van Sebroeck, Rob Herring, Mark Rutland, Carlo Caione,
Kevin Hilman, Matthias Brugger, Barry Song, Maxime Ripard,
Chen-Yu Tsai, Linus Walleij, Vladimir Zapolskiy, Sylvain Lemieux,
Nicolas Ferre, Alexandre Belloni,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On Sun, Feb 11, 2018 at 09:08:47PM +0100, Marcus Folkesson wrote:
> 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.
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
> ---
>
> Notes:
> v3:
> - Reformat and use coh901327_wdt.timeout instead of margin when print out
> timout in probe function.
>
> 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 | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c
> index 4410337f4f7f..500af8a7ec5a 100644
> --- a/drivers/watchdog/coh901327_wdt.c
> +++ b/drivers/watchdog/coh901327_wdt.c
> @@ -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,16 +318,15 @@ 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);
> if (ret)
> goto out_no_wdog;
>
> - dev_info(dev, "initialized. timer margin=%d sec\n", margin);
> + dev_info(dev, "initialized. (timeout=%d sec)\n",
> + coh901327_wdt.timeout);
> return 0;
>
> out_no_wdog:
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided in devicetree
2018-02-11 20:08 ` [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided " Marcus Folkesson
[not found] ` <20180211200847.25000-7-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2018-02-22 14:01 ` Linus Walleij
1 sibling, 0 replies; 22+ messages in thread
From: Linus Walleij @ 2018-02-22 14:01 UTC (permalink / raw)
To: Marcus Folkesson
Cc: Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Barry Song, linux-kernel, LINUXWATCHDOG, Kevin Hilman,
moderated list:ARM/Mediatek SoC support, Chen-Yu Tsai,
Vladimir Zapolskiy, Matthias Brugger, Wim Van Sebroeck,
Rob Herring, Alexandre Belloni, Linux ARM, Sylvain Lemieux,
Carlo Caione, open list:ARM/Amlogic Meson...,
Maxime Ripard, Guenter
On Sun, Feb 11, 2018 at 9:08 PM, Marcus Folkesson
<marcus.folkesson@gmail.com> wrote:
> 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.
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
> ---
>
> Notes:
> v3:
> - Reformat and use coh901327_wdt.timeout instead of margin when print out
> timout in probe function.
>
> 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.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [v3, 1/7] watchdog: sama5d4: make use of timeout-secs provided in devicetree
[not found] ` <20180211200847.25000-1-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
` (2 preceding siblings ...)
2018-02-11 20:08 ` [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided " Marcus Folkesson
@ 2018-02-12 1:10 ` Guenter Roeck
2018-02-12 8:59 ` [PATCH v3 " Nicolas Ferre
4 siblings, 0 replies; 22+ messages in thread
From: Guenter Roeck @ 2018-02-12 1:10 UTC (permalink / raw)
To: Marcus Folkesson
Cc: Wim Van Sebroeck, Rob Herring, Mark Rutland, Carlo Caione,
Kevin Hilman, Matthias Brugger, Barry Song, Maxime Ripard,
Chen-Yu Tsai, Linus Walleij, Vladimir Zapolskiy, Sylvain Lemieux,
Nicolas Ferre, Alexandre Belloni,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On Sun, Feb 11, 2018 at 09:08:41PM +0100, Marcus Folkesson wrote:
> 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.
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
> ---
>
> Notes:
> v3:
> - Use wdd->timeout instead of wdt_timeout when print out
> timout in probe function.
>
> drivers/watchdog/sama5d4_wdt.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
> index 0ae947c3d7bc..255169916dbb 100644
> --- a/drivers/watchdog/sama5d4_wdt.c
> +++ b/drivers/watchdog/sama5d4_wdt.c
> @@ -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;
> @@ -273,7 +273,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, wdt);
>
> dev_info(&pdev->dev, "initialized (timeout = %d sec, nowayout = %d)\n",
> - wdt_timeout, nowayout);
> + wdd->timeout, nowayout);
>
> return 0;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v3 1/7] watchdog: sama5d4: make use of timeout-secs provided in devicetree
[not found] ` <20180211200847.25000-1-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
` (3 preceding siblings ...)
2018-02-12 1:10 ` [v3, 1/7] watchdog: sama5d4: " Guenter Roeck
@ 2018-02-12 8:59 ` Nicolas Ferre
4 siblings, 0 replies; 22+ messages in thread
From: Nicolas Ferre @ 2018-02-12 8:59 UTC (permalink / raw)
To: Marcus Folkesson, Wim Van Sebroeck, Guenter Roeck, Rob Herring,
Mark Rutland, Carlo Caione, Kevin Hilman, Matthias Brugger,
Barry Song, Maxime Ripard, Chen-Yu Tsai, Linus Walleij,
Vladimir Zapolskiy, Sylvain Lemieux, Alexandre Belloni
Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On 11/02/2018 at 21:08, Marcus Folkesson wrote:
> 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.
>
> Signed-off-by: Marcus Folkesson <marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Nicolas Ferre <nicolas.ferre-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org>
Thanks, best regards,
Nicolas
> ---
>
> Notes:
> v3:
> - Use wdd->timeout instead of wdt_timeout when print out
> timout in probe function.
>
> drivers/watchdog/sama5d4_wdt.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
> index 0ae947c3d7bc..255169916dbb 100644
> --- a/drivers/watchdog/sama5d4_wdt.c
> +++ b/drivers/watchdog/sama5d4_wdt.c
> @@ -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;
> @@ -273,7 +273,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, wdt);
>
> dev_info(&pdev->dev, "initialized (timeout = %d sec, nowayout = %d)\n",
> - wdt_timeout, nowayout);
> + wdd->timeout, nowayout);
>
> return 0;
> }
>
--
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 22+ messages in thread