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 4/6] watchdog: pnx4008: restart: support "cmd" from userspace
Date: Thu, 25 Feb 2016 13:31:38 -0500 [thread overview]
Message-ID: <1456425100-28136-5-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>
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 v3 to v4:
- none.
Changes from v2 to v3:
- no logical change; updated to work with new revision of patch #2.
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 | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index fbf027e..e97b611 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -130,6 +130,21 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd,
static int pnx4008_restart_handler(struct notifier_block *this,
unsigned long mode, void *cmd)
{
+ const char *boot_cmd = (const char *)cmd;
+
+ /*
+ * Verify if a "cmd" passed from the userspace program rebooting
+ * the system; if available, handle it.
+ * - For details, see the 'reboot' syscall in kernel/reboot.c
+ * - If the received "cmd" is not supported, use the default mode.
+ */
+ if (boot_cmd) {
+ if (boot_cmd[0] == 'h')
+ mode = (unsigned long)REBOOT_HARD;
+ else if (boot_cmd[0] == 's')
+ mode = (unsigned long)REBOOT_SOFT;
+ }
+
if (mode == (unsigned long)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-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 ` [PATCH v4 2/6] watchdog: pnx4008: add restart handler Sylvain Lemieux
2016-02-25 18:31 ` [PATCH v4 3/6] watchdog: pnx4008: add support for soft reset Sylvain Lemieux
2016-02-25 18:31 ` Sylvain Lemieux [this message]
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-5-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).