From patchwork Fri Mar 4 18:44:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8507071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 56E8E9F38C for ; Fri, 4 Mar 2016 18:47:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74D652014A for ; Fri, 4 Mar 2016 18:47:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8EECA20145 for ; Fri, 4 Mar 2016 18:47:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1abujM-0000JH-7h; Fri, 04 Mar 2016 18:45:40 +0000 Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1abuic-00076K-4z for linux-arm-kernel@lists.infradead.org; Fri, 04 Mar 2016 18:44:55 +0000 Received: by mail-io0-x241.google.com with SMTP id l127so5768635iof.1 for ; Fri, 04 Mar 2016 10:44:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8NJkXb51smd6+YUH5dVqA/4JL604JLFD8Cq1fv1711k=; b=KbJ6ZDPMbbkt/YnpYOLD6vlrKtHxA38htfQRP5iNlMCxvpk1aDQyWzm6oF5qJNya9E H0LOm+eioC2SXChnJaQUumrTQiVscYbssBFwJow9MGxfIc2Bqx2P8ZqIyDmJG/DDztI0 HkOtH805NmNfOL8ntw+sYtrHftligXtU1lksx2BKoeMYqqLfB49SR/rUPyu9/8MQ1Yjq 0F9cQDwuSxDlkSIc3ntuQW3vrEBix1A2CwGALITFu8p98xPgg4ldw1PAX4c20XTntjUt WpbyyGZ8RnB/yHN1pYoVxRB4h57Wkx/XyQn9gM38zsm3/pwqEsCYL2Rynj+MrcFdnHgl GmNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8NJkXb51smd6+YUH5dVqA/4JL604JLFD8Cq1fv1711k=; b=KHbei8vClRKx36pMGjQhZny8FjLKQPlTLfMesKkfixug02gBS9fyZQCxslR0MTxd5h KI9XhKzFqD61So3jbEIrg3dkYwTGi6gwpOP5InDkYS2YQxpSpg4vv9xu7DqcnkxVHGUt Xlt+2Pa7b8kjRtjwkNoxExAIaK5K7R9IOyb+8W+J1yG3MC/On7TO/kiDrVjdPYCWJtgw W1QGKFdXhLTZUMuZbBR6n0za32amfP9ZvoGy166lxzBhyf0emJQLeb1XLbv7FDyedIdq 0HJVvhk9DzsmRtMYibzxhIss06fNi+zH3m5X7mB6EihuvhiqQHC23/XZyn5FcLQ8cpGE dG3w== X-Gm-Message-State: AD7BkJKm3WGz3fAUIJcD0wwf5l6bojubKfJqXK9B+4huL5ysH2uYLuOkAP3iSrPF43++gQ== X-Received: by 10.107.14.66 with SMTP id 63mr10137273ioo.150.1457117073073; Fri, 04 Mar 2016 10:44:33 -0800 (PST) Received: from CABRO3AP00510.americas.tsp.ad ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id nh19sm146470igb.2.2016.03.04.10.44.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2016 10:44:31 -0800 (PST) From: Sylvain Lemieux To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linux@roeck-us.net, manabian@gmail.com Subject: [PATCH v7 4/6] watchdog: pnx4008: restart: support "cmd" from userspace Date: Fri, 4 Mar 2016 13:44:08 -0500 Message-Id: <1457117050-13543-5-git-send-email-slemieux.tyco@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1457117050-13543-1-git-send-email-slemieux.tyco@gmail.com> References: <1457117050-13543-1-git-send-email-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160304_104454_378312_F3606245 X-CRM114-Status: GOOD ( 13.69 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stigge@antcom.de, wim@iguana.be, linux-watchdog@vger.kernel.org, vz@mleia.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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));