From patchwork Thu Mar 3 21:20:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8496271 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 4CED69F2F0 for ; Thu, 3 Mar 2016 21:23:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6FEF3202FF for ; Thu, 3 Mar 2016 21:23:51 +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 92F8A20173 for ; Thu, 3 Mar 2016 21:23:50 +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 1abahH-00083u-0F; Thu, 03 Mar 2016 21:22:11 +0000 Received: from mail-oi0-x241.google.com ([2607:f8b0:4003:c06::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1abagE-0007KM-Mi for linux-arm-kernel@lists.infradead.org; Thu, 03 Mar 2016 21:21:08 +0000 Received: by mail-oi0-x241.google.com with SMTP id c129so1946090oif.3 for ; Thu, 03 Mar 2016 13:20:46 -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=5y3XEgUvRjUTgTWwUcVSidR6FT8jP4euICiyqQkDwzo=; b=PfatyEdC1VdaaVSNcIdnY6TRsCU0oasK6R5/xjJKyhbQLhTMjhk0bCEUxGWOs/Vab/ tF7tuVkwb6qkc+czG0E/jgQ7jo3CgZS83POhIvCprWGSdW9gpDl3VpHrXoZ0Mmg9L9Wz v5LdHsHZEnJdARWy43grT8WDYZxNg3Uj09dQ5S6gjde9nOZnRdIj5GvMnL2DJN0nD3b5 9FxbV2bqy54lq9qykfzX98NerCxr7LOnfywlUPakkYmATKHLupn4nKm6DXI4dTvJWW7b TAisycLepoRkqKCAWPTzIzxywQVd25lJKwtXYqTClFo7MOqldYI/RFEjylZHwzT8pWF/ Gq9Q== 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=5y3XEgUvRjUTgTWwUcVSidR6FT8jP4euICiyqQkDwzo=; b=FabEqNwZQ96kXjY6vVsM6bDCSFNJ4pe6AVvDlJJ1su+dUxieF0pzN+L/nAB9EJSGnG VoEImVbbcnaRdQ9bMXOT9+k0dN9SUwGfHnF3dUIz06LmFIMsAWHOWggg6D3mXLZ1HHAw C9QUpTQ+dx8QXEWax1th61JNsLlE/6X+Qy9LVRDlKYEFsvqzd3mtjOh6wz7mPnKx1afS VYdr+td+OcGk19RfP3jzj2vIIlkWwm2dbmBYtkek+GXdBlpiyfPGmTIxGJb+79K95D/k DL4ssWvbrARNvlELS/6LsF3pxM1icW0ZGhqdI7bMB1nixt60Q7da6LWViZ4b4yZgV4z+ 2dLg== X-Gm-Message-State: AD7BkJKo/88N1oSzxI6tIJELRboQAuhcDahr5visehgjm7ESUMAuVEMPmT7b3Wb/4uW2gQ== X-Received: by 10.50.64.179 with SMTP id p19mr1221784igs.25.1457040045709; Thu, 03 Mar 2016 13:20:45 -0800 (PST) Received: from CABRO3AP00510.americas.tsp.ad ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id g67sm363545ioe.34.2016.03.03.13.20.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Mar 2016 13:20:44 -0800 (PST) From: Sylvain Lemieux To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linux@roeck-us.net, manabian@gmail.com Subject: [PATCH v6 4/6] watchdog: pnx4008: restart: support "cmd" from userspace Date: Thu, 3 Mar 2016 16:20:23 -0500 Message-Id: <1457040025-1108-5-git-send-email-slemieux.tyco@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1457040025-1108-1-git-send-email-slemieux.tyco@gmail.com> References: <1457040025-1108-1-git-send-email-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160303_132107_140632_0F8848E4 X-CRM114-Status: GOOD ( 13.39 ) 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 --- 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..4162135 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 = (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 = 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));