From: Marcus Folkesson <marcus.folkesson@gmail.com>
To: Wim Van Sebroeck <wim@iguana.be>,
Guenter Roeck <linux@roeck-us.net>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Carlo Caione <carlo@caione.org>,
Kevin Hilman <khilman@baylibre.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Barry Song <baohua@kernel.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Chen-Yu Tsai <wens@csie.org>,
Linus Walleij <linus.walleij@linaro.org>,
Vladimir Zapolskiy <vz@mleia.com>,
Sylvain Lemieux <slemieux.tyco@gmail.com>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-mediatek@lists.infradead.org,
Marcus Folkesson <marcus.folkesson@gmail.com>
Subject: [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided in devicetree
Date: Sun, 11 Feb 2018 21:08:47 +0100 [thread overview]
Message-ID: <20180211200847.25000-7-marcus.folkesson@gmail.com> (raw)
In-Reply-To: <20180211200847.25000-1-marcus.folkesson@gmail.com>
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.
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
WARNING: multiple messages have this Message-ID (diff)
From: Marcus Folkesson <marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Wim Van Sebroeck <wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org>,
Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>,
Kevin Hilman <khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>,
Matthias Brugger
<matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Barry Song <baohua-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Maxime Ripard
<maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>,
Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>,
Linus Walleij
<linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Vladimir Zapolskiy <vz-ChpfBGZJDbMAvxtiuMwx3w@public.gmane.org>,
Sylvain Lemieux
<slemieux.tyco-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Nicolas Ferre
<nicolas.ferre-UWL1GkI3JZL3oGB3hsPCZA@public.gmane.org>,
Alexandre Belloni
<alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Marcus Folkesson
<marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided in devicetree
Date: Sun, 11 Feb 2018 21:08:47 +0100 [thread overview]
Message-ID: <20180211200847.25000-7-marcus.folkesson@gmail.com> (raw)
In-Reply-To: <20180211200847.25000-1-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
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
WARNING: multiple messages have this Message-ID (diff)
From: marcus.folkesson@gmail.com (Marcus Folkesson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided in devicetree
Date: Sun, 11 Feb 2018 21:08:47 +0100 [thread overview]
Message-ID: <20180211200847.25000-7-marcus.folkesson@gmail.com> (raw)
In-Reply-To: <20180211200847.25000-1-marcus.folkesson@gmail.com>
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.
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
WARNING: multiple messages have this Message-ID (diff)
From: marcus.folkesson@gmail.com (Marcus Folkesson)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided in devicetree
Date: Sun, 11 Feb 2018 21:08:47 +0100 [thread overview]
Message-ID: <20180211200847.25000-7-marcus.folkesson@gmail.com> (raw)
In-Reply-To: <20180211200847.25000-1-marcus.folkesson@gmail.com>
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.
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
next prev parent reply other threads:[~2018-02-11 20:09 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-11 20:08 [PATCH v3 1/7] watchdog: sama5d4: make use of timeout-secs provided in devicetree Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` [PATCH v3 2/7] watchdog: sunxi: allow setting timeout " Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-19 0:06 ` Rob Herring
2018-02-19 0:06 ` Rob Herring
2018-02-19 0:06 ` Rob Herring
2018-02-19 0:06 ` Rob Herring
2018-02-19 3:01 ` Chen-Yu Tsai
2018-02-19 3:01 ` Chen-Yu Tsai
2018-02-19 3:01 ` Chen-Yu Tsai
2018-02-19 3:01 ` Chen-Yu Tsai
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 ` Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-19 0:07 ` Rob Herring
2018-02-19 0:07 ` Rob Herring
2018-02-19 0:07 ` Rob Herring
2018-02-19 0:07 ` Rob Herring
2018-02-19 1:07 ` Guenter Roeck
2018-02-19 1:07 ` Guenter Roeck
2018-02-19 1:07 ` Guenter Roeck
2018-02-19 1:07 ` Guenter Roeck
2018-02-22 0:02 ` Rob Herring
2018-02-22 0:02 ` Rob Herring
2018-02-22 0:02 ` Rob Herring
2018-02-22 0:02 ` Rob Herring
2018-02-11 20:08 ` [PATCH v3 4/7] watchdog: pnx4008: make use of timeout-secs provided " Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` [PATCH v3 5/7] watchdog: mtk: allow setting timeout " Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-19 0:08 ` Rob Herring
2018-02-19 0:08 ` Rob Herring
2018-02-19 0:08 ` Rob Herring
2018-02-19 0:08 ` Rob Herring
2018-02-19 1:08 ` Guenter Roeck
2018-02-19 1:08 ` Guenter Roeck
2018-02-19 1:08 ` Guenter Roeck
2018-02-19 1:08 ` Guenter Roeck
2018-02-19 17:02 ` Matthias Brugger
2018-02-19 17:02 ` Matthias Brugger
2018-02-19 17:02 ` Matthias Brugger
2018-02-19 17:02 ` Matthias Brugger
2018-02-11 20:08 ` [PATCH v3 6/7] watchdog: meson: " Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson [this message]
2018-02-11 20:08 ` [PATCH v3 7/7] watchdog: coh901327: make use of timeout-secs provided " Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-11 20:08 ` Marcus Folkesson
2018-02-12 1:11 ` [v3, " Guenter Roeck
2018-02-12 1:11 ` Guenter Roeck
2018-02-12 1:11 ` Guenter Roeck
2018-02-12 1:11 ` Guenter Roeck
2018-02-22 14:01 ` [PATCH v3 " Linus Walleij
2018-02-22 14:01 ` Linus Walleij
2018-02-22 14:01 ` Linus Walleij
2018-02-22 14:01 ` Linus Walleij
2018-02-12 1:10 ` [v3, 1/7] watchdog: sama5d4: " Guenter Roeck
2018-02-12 1:10 ` Guenter Roeck
2018-02-12 1:10 ` Guenter Roeck
2018-02-12 1:10 ` Guenter Roeck
2018-02-12 8:59 ` [PATCH v3 " Nicolas Ferre
2018-02-12 8:59 ` Nicolas Ferre
2018-02-12 8:59 ` Nicolas Ferre
2018-02-12 8:59 ` Nicolas Ferre
2018-03-16 13:37 ` Marcus Folkesson
2018-03-16 13:37 ` Marcus Folkesson
2018-03-16 13:37 ` Marcus Folkesson
2018-03-17 1:56 ` Guenter Roeck
2018-03-17 1:56 ` Guenter Roeck
2018-03-17 1:56 ` Guenter Roeck
2018-03-17 8:37 ` Marcus Folkesson
2018-03-17 8:37 ` Marcus Folkesson
2018-03-17 8:37 ` Marcus Folkesson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180211200847.25000-7-marcus.folkesson@gmail.com \
--to=marcus.folkesson@gmail.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=baohua@kernel.org \
--cc=carlo@caione.org \
--cc=devicetree@vger.kernel.org \
--cc=khilman@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=maxime.ripard@free-electrons.com \
--cc=nicolas.ferre@microchip.com \
--cc=robh+dt@kernel.org \
--cc=slemieux.tyco@gmail.com \
--cc=vz@mleia.com \
--cc=wens@csie.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.