From: Sylvain Lemieux <slemieux.tyco@gmail.com>
To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de,
wim@iguana.be, manabian@gmail.com
Cc: linux-watchdog@vger.kernel.org, linux@roeck-us.net,
stigge@antcom.de, vz@mleia.com
Subject: [PATCH v4 2/6] watchdog: pnx4008: add restart handler
Date: Thu, 25 Feb 2016 13:31:36 -0500 [thread overview]
Message-ID: <1456425100-28136-3-git-send-email-slemieux.tyco@gmail.com> (raw)
In-Reply-To: <1456425100-28136-1-git-send-email-slemieux.tyco@gmail.com>
From: Sylvain Lemieux <slemieux@tycoint.com>
Add restart handler capability to the driver;
the restart handler implementation was taken from
"mach-lpc32xx" ("lpc23xx_restart" function).
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v3 to v4:
- none.
Changes from v2 to v3:
- remove explicit clock enable from restart handler.
- verify "register_restart_handler" return value.
- add call to unregister_restart_handler".
- do the restart handling directly in "pnx4008_restart_handler".
Changes from v1 to v2:
- new patch in v2.
drivers/watchdog/pnx4008_wdt.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 88264a2..80ee4af 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -31,6 +31,8 @@
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/of.h>
+#include <linux/delay.h>
+#include <linux/reboot.h>
#include <mach/hardware.h>
/* WatchDog Timer - Chapter 23 Page 207 */
@@ -77,6 +79,7 @@
static bool nowayout = WATCHDOG_NOWAYOUT;
static unsigned int heartbeat = DEFAULT_HEARTBEAT;
+static struct notifier_block restart_handler;
static DEFINE_SPINLOCK(io_lock);
static void __iomem *wdt_base;
@@ -124,6 +127,19 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd,
return 0;
}
+static int pnx4008_restart_handler(struct notifier_block *this,
+ unsigned long mode, void *cmd)
+{
+ /* Instant assert of RESETOUT_N with pulse length 1mS */
+ writel(13000, WDTIM_PULSE(wdt_base));
+ writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base));
+
+ /* Wait for watchdog to reset system */
+ mdelay(1000);
+
+ return NOTIFY_DONE;
+}
+
static const struct watchdog_info pnx4008_wdt_ident = {
.options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE |
WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
@@ -157,6 +173,15 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
if (IS_ERR(wdt_base))
return PTR_ERR(wdt_base);
+ /* Register restart handler. */
+ restart_handler.notifier_call = pnx4008_restart_handler;
+ restart_handler.priority = 128;
+ ret = register_restart_handler(&restart_handler);
+ if (ret) {
+ dev_warn(&pdev->dev, "cannot register restart handler\n");
+ return ret;
+ }
+
wdt_clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(wdt_clk))
return PTR_ERR(wdt_clk);
@@ -189,6 +214,7 @@ disable_clk:
static int pnx4008_wdt_remove(struct platform_device *pdev)
{
+ unregister_restart_handler(&restart_handler);
watchdog_unregister_device(&pnx4008_wdd);
clk_disable_unprepare(wdt_clk);
--
1.8.3.1
next prev parent reply other threads:[~2016-02-25 18:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 18:31 [PATCH v4 0/6] watchdog: pnx4008: add restart handler Sylvain Lemieux
2016-02-25 18:31 ` [PATCH v4 1/6] watchdog: pnx4008: update logging during power-on Sylvain Lemieux
2016-02-26 14:15 ` Guenter Roeck
2016-02-25 18:31 ` Sylvain Lemieux [this message]
2016-02-25 18:31 ` [PATCH v4 3/6] watchdog: pnx4008: add support for soft reset Sylvain Lemieux
2016-02-25 18:31 ` [PATCH v4 4/6] watchdog: pnx4008: restart: support "cmd" from userspace Sylvain Lemieux
2016-02-25 18:31 ` [PATCH v4 5/6] arm: lpc32xx: phy3250 remove restart hook Sylvain Lemieux
2016-02-25 18:31 ` [PATCH v4 6/6] arm: lpc32xx: remove restart handler Sylvain Lemieux
2016-02-26 14:36 ` [PATCH v4 0/6] watchdog: pnx4008: add " Guenter Roeck
2016-02-26 15:34 ` Sylvain Lemieux
2016-02-26 15:47 ` Guenter Roeck
2016-02-26 16:50 ` Sylvain Lemieux
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=1456425100-28136-3-git-send-email-slemieux.tyco@gmail.com \
--to=slemieux.tyco@gmail.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=manabian@gmail.com \
--cc=stigge@antcom.de \
--cc=vz@mleia.com \
--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 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).