From: slemieux.tyco@gmail.com
To: linux-arm-kernel@lists.infradead.org, wim@iguana.be, manabian@gmail.com
Cc: linux-watchdog@vger.kernel.org, linux@roeck-us.net,
stigge@antcom.de, vz@mleia.com
Subject: [PATCH v2 4/5] watchdog: pnx4008: restart: support "cmd" from userspace
Date: Mon, 22 Feb 2016 11:55:42 -0500 [thread overview]
Message-ID: <1456160143-26761-5-git-send-email-slemieux.tyco@gmail.com> (raw)
In-Reply-To: <1456160143-26761-1-git-send-email-slemieux.tyco@gmail.com>
From: Sylvain Lemieux <slemieux@tycoint.com>
Added support to verify if a "cmd" is passed from the userspace program rebooting the system;
- if a valid "cmd" is available, handle it;
- If the received "cmd" is not supported, use the default reboot mode.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v1 to v2:
- Rename patch title;
was "arm: lpc32xx: restart: support "cmd" from userspace"
- Add change to "pnx-4008" driver instead of "mach-lpc32xx".
drivers/watchdog/pnx4008_wdt.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 2275fd4..5f34299 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -133,6 +133,19 @@ static void pnx4008_wdt_sys_reset(enum reboot_mode mode, const char *cmd)
/* Make sure WDT clocks are enabled */
writel(LPC32XX_CLKPWR_PWMCLK_WDOG_EN, LPC32XX_CLKPWR_TIMER_CLK_CTRL);
+ /*
+ * Verify if a "cmd" passed from the userspace program rebooting
+ * the system; if available, and handle it.
+ * - For details, see the 'reboot' syscall in kernel/reboot.c
+ * - If the received "cmd" is not supported, use the default mode.
+ */
+ if (cmd) {
+ if (cmd[0] == 'h')
+ mode = REBOOT_HARD;
+ else if (cmd[0] == 's')
+ mode = REBOOT_SOFT;
+ }
+
if (mode == REBOOT_SOFT) {
/* Force match output active */
writel(EXT_MATCH0, WDTIM_EMR(wdt_base));
--
1.8.3.1
next prev parent reply other threads:[~2016-02-22 16:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 16:55 [PATCH v2 0/5] watchdog: pnx4008: add restart handler slemieux.tyco
2016-02-22 16:55 ` [PATCH v2 1/5] watchdog: pnx4008: update logging during power-on slemieux.tyco
2016-02-22 16:55 ` [PATCH v2 2/5] watchdog: pnx4008: add restart handler slemieux.tyco
2016-02-22 18:03 ` Joachim Eastwood
2016-02-22 18:25 ` Sylvain Lemieux
2016-02-22 16:55 ` [PATCH v2 3/5] watchdog: pnx4008: add support for soft reset slemieux.tyco
2016-02-22 16:55 ` slemieux.tyco [this message]
2016-02-22 16:55 ` [PATCH v2 5/5] arm: lpc32xx: remove restart handler slemieux.tyco
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=1456160143-26761-5-git-send-email-slemieux.tyco@gmail.com \
--to=slemieux.tyco@gmail.com \
--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).