From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from bh-25.webhostbox.net ([208.91.199.152]:55659 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760368AbcCDXO7 (ORCPT ); Fri, 4 Mar 2016 18:14:59 -0500 Date: Fri, 4 Mar 2016 15:14:56 -0800 From: Guenter Roeck To: Sylvain Lemieux Cc: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, manabian@gmail.com, linux-watchdog@vger.kernel.org, wim@iguana.be, stigge@antcom.de, vz@mleia.com Subject: Re: [PATCH v7 4/6] watchdog: pnx4008: restart: support "cmd" from userspace Message-ID: <20160304231456.GA31027@roeck-us.net> References: <1457117050-13543-1-git-send-email-slemieux.tyco@gmail.com> <1457117050-13543-5-git-send-email-slemieux.tyco@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1457117050-13543-5-git-send-email-slemieux.tyco@gmail.com> Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org On Fri, Mar 04, 2016 at 01:44:08PM -0500, Sylvain Lemieux wrote: > From: Sylvain Lemieux > > 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 Reviewed-by: Guenter Roeck > --- > Changes from v6 to v7: > - remove typecast. > > Changes from v5 to v6: > - remove typecast. > > Changes from v4 to v5: > - no logical change; updated to work with new revision of patch #2. > > 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 51be66e..0529aed 100644 > --- a/drivers/watchdog/pnx4008_wdt.c > +++ b/drivers/watchdog/pnx4008_wdt.c > @@ -129,6 +129,21 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd, > static int pnx4008_restart_handler(struct watchdog_device *wdd, > unsigned long mode, void *cmd) > { > + const char *boot_cmd = 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 = REBOOT_HARD; > + else if (boot_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 >