From: fabrizio.castro@bp.renesas.com (Fabrizio Castro)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 13/26] watchdog: renesas_wdt: Add restart handler
Date: Mon, 12 Feb 2018 17:44:22 +0000 [thread overview]
Message-ID: <1518457475-4480-14-git-send-email-fabrizio.castro@bp.renesas.com> (raw)
In-Reply-To: <1518457475-4480-1-git-send-email-fabrizio.castro@bp.renesas.com>
On iWave's boards iwg20d and iwg22d the only way to reboot the system is
by means of the watchdog.
This patch adds a restart handler to rwdt_ops, and also makes sure we
keep its priority to a medium level, in order to not override other more
effective handlers.
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
---
v4->v5:
* changed rwdt_restart implementation as per Wolfram comments
drivers/watchdog/renesas_wdt.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c
index e972b7b..0f88614 100644
--- a/drivers/watchdog/renesas_wdt.c
+++ b/drivers/watchdog/renesas_wdt.c
@@ -107,6 +107,16 @@ static unsigned int rwdt_get_timeleft(struct watchdog_device *wdev)
return DIV_BY_CLKS_PER_SEC(priv, 65536 - val);
}
+static int rwdt_restart(struct watchdog_device *wdev, unsigned long action,
+ void *data)
+{
+ struct rwdt_priv *priv = watchdog_get_drvdata(wdev);
+
+ rwdt_start(wdev);
+ rwdt_write(priv, 0xffff, RWTCNT);
+ return 0;
+}
+
static const struct watchdog_info rwdt_ident = {
.options = WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT,
.identity = "Renesas WDT Watchdog",
@@ -118,6 +128,7 @@ static const struct watchdog_ops rwdt_ops = {
.stop = rwdt_stop,
.ping = rwdt_init_timeout,
.get_timeleft = rwdt_get_timeleft,
+ .restart = rwdt_restart,
};
static int rwdt_probe(struct platform_device *pdev)
@@ -176,6 +187,7 @@ static int rwdt_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, priv);
watchdog_set_drvdata(&priv->wdev, priv);
watchdog_set_nowayout(&priv->wdev, nowayout);
+ watchdog_set_restart_priority(&priv->wdev, 0);
/* This overrides the default timeout only if DT configuration was found */
ret = watchdog_init_timeout(&priv->wdev, 0, &pdev->dev);
--
2.7.4
next prev parent reply other threads:[~2018-02-12 17:44 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-12 17:44 [PATCH v5 00/26] Fix watchdog on Renesas R-Car Gen2 and RZ/G1 Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 01/26] ARM: shmobile: Add watchdog support Fabrizio Castro
2018-02-28 12:57 ` Geert Uytterhoeven
2018-02-28 17:37 ` Fabrizio Castro
2018-02-28 17:40 ` [PATCH v6 " Fabrizio Castro
2018-03-01 9:44 ` Simon Horman
2018-03-13 13:43 ` Geert Uytterhoeven
2018-03-14 11:02 ` Fabrizio Castro
2018-03-14 11:13 ` [PATCH v7] " Fabrizio Castro
2018-03-14 12:43 ` Simon Horman
2018-03-14 13:26 ` Fabrizio Castro
2018-03-16 11:49 ` Simon Horman
2018-02-12 17:44 ` [PATCH v5 02/26] ARM: dts: r8a7743: Adjust SMP routine size Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 03/26] ARM: dts: r8a7745: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 04/26] ARM: dts: r8a7790: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 05/26] ARM: dts: r8a7791: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 06/26] ARM: dts: r8a7792: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 07/26] ARM: dts: r8a7793: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 08/26] ARM: dts: r8a7794: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 09/26] soc: renesas: rcar-rst: Enable watchdog as reset trigger for Gen2 Fabrizio Castro
2018-02-13 8:19 ` Simon Horman
2018-02-13 12:57 ` Fabrizio Castro
2018-02-13 13:02 ` [PATCH v6 " Fabrizio Castro
2018-02-15 16:20 ` Simon Horman
2018-02-12 17:44 ` [PATCH v5 10/26] ARM: shmobile: rcar-gen2: Add watchdog support Fabrizio Castro
2018-02-13 8:21 ` Simon Horman
2018-02-12 17:44 ` [PATCH v5 11/26] dt-bindings: watchdog: renesas-wdt: Add R-Car Gen2 support Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 12/26] watchdog: renesas_wdt: " Fabrizio Castro
2018-02-12 19:24 ` Guenter Roeck
2018-02-12 20:58 ` Wolfram Sang
2018-02-28 19:24 ` Geert Uytterhoeven
2018-03-01 15:34 ` Fabrizio Castro
2018-02-12 17:44 ` Fabrizio Castro [this message]
2018-02-12 20:59 ` [PATCH v5 13/26] watchdog: renesas_wdt: Add restart handler Wolfram Sang
2018-02-12 17:44 ` [PATCH v5 14/26] ARM: shmobile: defconfig: Enable RENESAS_WDT_GEN Fabrizio Castro
2018-02-13 13:08 ` Fabrizio Castro
2018-02-15 16:20 ` Simon Horman
2018-05-02 9:38 ` Simon Horman
2018-02-12 17:44 ` [PATCH v5 15/26] clk: renesas: r8a7743: Add rwdt clock Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 16/26] clk: renesas: r8a7745: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 17/26] clk: renesas: r8a7790: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 18/26] clk: renesas: r8a7791/r8a7793: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 19/26] clk: renesas: r8a7794: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 20/26] ARM: dts: r8a7743: Add watchdog support to SoC dtsi Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 21/26] ARM: dts: r8a7745: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 22/26] ARM: dts: r8a7790: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 23/26] ARM: dts: r8a7791: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 24/26] ARM: dts: r8a7794: " Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 25/26] ARM: dts: iwg20m: Add watchdog support to SoM dtsi Fabrizio Castro
2018-02-12 17:44 ` [PATCH v5 26/26] ARM: dts: iwg22m: " Fabrizio Castro
2018-02-13 8:05 ` [PATCH v5 00/26] Fix watchdog on Renesas R-Car Gen2 and RZ/G1 Simon Horman
2018-02-20 12:51 ` Geert Uytterhoeven
2018-02-21 16:13 ` Simon Horman
2018-02-21 16:30 ` Geert Uytterhoeven
2018-02-21 18:32 ` Simon Horman
2018-02-22 8:38 ` Geert Uytterhoeven
2018-02-23 8:14 ` Simon Horman
2018-03-01 10:20 ` Geert Uytterhoeven
2018-03-13 20:05 ` Simon Horman
2018-03-14 8:17 ` Geert Uytterhoeven
2018-04-18 13:37 ` Geert Uytterhoeven
2018-04-24 9:09 ` Simon Horman
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=1518457475-4480-14-git-send-email-fabrizio.castro@bp.renesas.com \
--to=fabrizio.castro@bp.renesas.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).