Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1732227 > unrolled thread
| Started by | Oleksij Rempel <o.rempel@pengutronix.de> |
|---|---|
| First post | 2017-09-14 13:40 +0200 |
| Last post | 2017-09-14 17:00 +0200 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH v2 1/2] watchdog: dw_wdt: add stop watchdog operation Oleksij Rempel <o.rempel@pengutronix.de> - 2017-09-14 13:40 +0200
[PATCH v2 2/2] ARM: socfpga: dtsi: add dw-wdt reset lines Oleksij Rempel <o.rempel@pengutronix.de> - 2017-09-14 13:40 +0200
Re: [PATCH v2 1/2] watchdog: dw_wdt: add stop watchdog operation Philipp Zabel <p.zabel@pengutronix.de> - 2017-09-14 13:50 +0200
Re: [PATCH v2 1/2] watchdog: dw_wdt: add stop watchdog operation Guenter Roeck <linux@roeck-us.net> - 2017-09-14 17:00 +0200
| From | Oleksij Rempel <o.rempel@pengutronix.de> |
|---|---|
| Date | 2017-09-14 13:40 +0200 |
| Subject | [PATCH v2 1/2] watchdog: dw_wdt: add stop watchdog operation |
| Message-ID | <upAEW-4qT-3@gated-at.bofh.it> |
From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
The only way of stopping the watchdog is by resetting it.
Add the watchdog op for stopping the device and reset if
a reset line is provided.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org
---
changes v2:
- test if dw_wdt->rst is NULL instead of IS_ERR
drivers/watchdog/dw_wdt.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 36be987ff9ef..a507f36302e1 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -135,6 +135,21 @@ static int dw_wdt_start(struct watchdog_device *wdd)
return 0;
}
+static int dw_wdt_stop(struct watchdog_device *wdd)
+{
+ struct dw_wdt *dw_wdt = to_dw_wdt(wdd);
+
+ if (!dw_wdt->rst) {
+ dev_warn(wdd->parent, "No reset line. Will not stop.\n");
+ return -EOPNOTSUPP;
+ }
+
+ reset_control_assert(dw_wdt->rst);
+ reset_control_deassert(dw_wdt->rst);
+
+ return 0;
+}
+
static int dw_wdt_restart(struct watchdog_device *wdd,
unsigned long action, void *data)
{
@@ -173,6 +188,7 @@ static const struct watchdog_info dw_wdt_ident = {
static const struct watchdog_ops dw_wdt_ops = {
.owner = THIS_MODULE,
.start = dw_wdt_start,
+ .stop = dw_wdt_stop,
.ping = dw_wdt_ping,
.set_timeout = dw_wdt_set_timeout,
.get_timeleft = dw_wdt_get_timeleft,
--
2.11.0
[toc] | [next] | [standalone]
| From | Oleksij Rempel <o.rempel@pengutronix.de> |
|---|---|
| Date | 2017-09-14 13:40 +0200 |
| Subject | [PATCH v2 2/2] ARM: socfpga: dtsi: add dw-wdt reset lines |
| Message-ID | <upAEW-4qT-5@gated-at.bofh.it> |
| In reply to | #1732227 |
From: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/boot/dts/socfpga.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 7e24dc8e82d4..6e49cee084b8 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -924,6 +924,7 @@ reg = <0xffd02000 0x1000>; interrupts = <0 171 4>; clocks = <&osc1>; + resets = <&rst L4WD0_RESET>; status = "disabled"; }; @@ -932,6 +933,7 @@ reg = <0xffd03000 0x1000>; interrupts = <0 172 4>; clocks = <&osc1>; + resets = <&rst L4WD1_RESET>; status = "disabled"; }; }; -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Philipp Zabel <p.zabel@pengutronix.de> |
|---|---|
| Date | 2017-09-14 13:50 +0200 |
| Message-ID | <upAOC-4uy-15@gated-at.bofh.it> |
| In reply to | #1732227 |
On Thu, 2017-09-14 at 13:30 +0200, Oleksij Rempel wrote: > From: Steffen Trumtrar <s.trumtrar@pengutronix.de> > > The only way of stopping the watchdog is by resetting it. > Add the watchdog op for stopping the device and reset if > a reset line is provided. > > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > Cc: Wim Van Sebroeck <wim@iguana.be> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: linux-watchdog@vger.kernel.org Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
[toc] | [prev] | [next] | [standalone]
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Date | 2017-09-14 17:00 +0200 |
| Message-ID | <upDMt-6ln-5@gated-at.bofh.it> |
| In reply to | #1732227 |
On Thu, Sep 14, 2017 at 01:30:12PM +0200, Oleksij Rempel wrote:
> From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
>
> The only way of stopping the watchdog is by resetting it.
> Add the watchdog op for stopping the device and reset if
> a reset line is provided.
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> Cc: Wim Van Sebroeck <wim@iguana.be>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-watchdog@vger.kernel.org
> ---
>
> changes v2:
> - test if dw_wdt->rst is NULL instead of IS_ERR
>
> drivers/watchdog/dw_wdt.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
> index 36be987ff9ef..a507f36302e1 100644
> --- a/drivers/watchdog/dw_wdt.c
> +++ b/drivers/watchdog/dw_wdt.c
> @@ -135,6 +135,21 @@ static int dw_wdt_start(struct watchdog_device *wdd)
> return 0;
> }
>
> +static int dw_wdt_stop(struct watchdog_device *wdd)
> +{
> + struct dw_wdt *dw_wdt = to_dw_wdt(wdd);
> +
> + if (!dw_wdt->rst) {
> + dev_warn(wdd->parent, "No reset line. Will not stop.\n");
> + return -EOPNOTSUPP;
Sorry, not the way to go. It now reports an error to user space when
there was none previously, and it still reboots the system. Plus, this
was a perfectly fine condition previously, and the reset line is optional.
It is not appropriate to generate a warning for a perfectly valid
condition.
You can not change behavior for existing users.
Guenter
> + }
> +
> + reset_control_assert(dw_wdt->rst);
> + reset_control_deassert(dw_wdt->rst);
> +
> + return 0;
> +}
> +
> static int dw_wdt_restart(struct watchdog_device *wdd,
> unsigned long action, void *data)
> {
> @@ -173,6 +188,7 @@ static const struct watchdog_info dw_wdt_ident = {
> static const struct watchdog_ops dw_wdt_ops = {
> .owner = THIS_MODULE,
> .start = dw_wdt_start,
> + .stop = dw_wdt_stop,
> .ping = dw_wdt_ping,
> .set_timeout = dw_wdt_set_timeout,
> .get_timeleft = dw_wdt_get_timeleft,
> --
> 2.11.0
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web