From patchwork Sat May 10 00:31:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 4145801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 916A3BFF02 for ; Sat, 10 May 2014 00:35:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB4CB201DE for ; Sat, 10 May 2014 00:35:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C1DAF201BB for ; Sat, 10 May 2014 00:35:26 +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 1WivCu-0006zk-BY; Sat, 10 May 2014 00:32:04 +0000 Received: from mail-pd0-x22e.google.com ([2607:f8b0:400e:c02::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WivCo-0006xI-Sy for linux-arm-kernel@lists.infradead.org; Sat, 10 May 2014 00:31:59 +0000 Received: by mail-pd0-f174.google.com with SMTP id w10so4234295pde.19 for ; Fri, 09 May 2014 17:31:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xq5mkSRJcVmpGxkPHE/kMamjK8YYeacMdKg9xDniQ6A=; b=mLPii1dTma4euKCWx/8YSrLRcM9YbNnQ+NAhV9N4euhm/rv0CSnt4TwvR4BE1wx9Dn 1I5xGgJZ2X82xAEeFu6CxONXHAX7WXXm5M+pkHsBK3RJFoXemUh8P2S61KeDdSjR7smR 7n8RFgu0GcQK3OoZDYSOuL+pXPJqnNfHUbgA2Lhhi7WpeLBVrnBPq+LjVvX42nDtuAdZ zuqaOBHiTeYr7fVUPOz3lS41d3g3Up2mZ0x4z1euy14cZs/5dVIOPC384B+gSfhhptZq 6qQVRfGEagQ7QIt4D9KAUzBT0ejPozUYMZe64wK7oPO4MbBpEh6URSOrXchA3gjPPlTe LMmA== X-Received: by 10.67.23.234 with SMTP id id10mr1964946pad.54.1399681897548; Fri, 09 May 2014 17:31:37 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id ek2sm9734248pbd.30.2014.05.09.17.31.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 09 May 2014 17:31:36 -0700 (PDT) From: Guenter Roeck To: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/5] watchdog: Add API to trigger reboots Date: Fri, 9 May 2014 17:31:19 -0700 Message-Id: <1399681883-891-2-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1399681883-891-1-git-send-email-linux@roeck-us.net> References: <1399681883-891-1-git-send-email-linux@roeck-us.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140509_173158_978837_50A2AC93 X-CRM114-Status: GOOD ( 16.62 ) X-Spam-Score: 0.2 (/) Cc: Russell King , Heiko Stuebner , Arnd Bergmann , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, Jonas Jensen , Wim Van Sebroeck , Maxime Ripard , Guenter Roeck X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 Some hardware implements reboot through its watchdog hardware, for example by triggering a watchdog timeout. Platform specific code starts to spread into watchdog drivers, typically by setting pointers to a callback functions which is then called from the platform reset handler. To simplify code and provide a unified API to trigger reboots by watchdog drivers, provide a single API to trigger such reboots through the watchdog subsystem. Acked-by: Maxime Ripard Acked-by: Arnd Bergmann Tested-by: Jonas Jensen Acked-by: Heiko Stuebner Signed-off-by: Guenter Roeck --- v2: Remove unnecessary check for ops in reboot function drivers/watchdog/watchdog_core.c | 15 +++++++++++++++ include/linux/watchdog.h | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index cec9b55..edfd9c5 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -43,6 +43,15 @@ static DEFINE_IDA(watchdog_ida); static struct class *watchdog_class; +static struct watchdog_device *wdd_reboot_dev; + +void watchdog_do_reboot(enum reboot_mode mode, const char *cmd) +{ + if (wdd_reboot_dev) + wdd_reboot_dev->ops->reboot(wdd_reboot_dev, mode, cmd); +} +EXPORT_SYMBOL(watchdog_do_reboot); + static void watchdog_check_min_max_timeout(struct watchdog_device *wdd) { /* @@ -162,6 +171,9 @@ int watchdog_register_device(struct watchdog_device *wdd) return ret; } + if (wdd->ops->reboot) + wdd_reboot_dev = wdd; + return 0; } EXPORT_SYMBOL_GPL(watchdog_register_device); @@ -181,6 +193,9 @@ void watchdog_unregister_device(struct watchdog_device *wdd) if (wdd == NULL) return; + if (wdd == wdd_reboot_dev) + wdd_reboot_dev = NULL; + devno = wdd->cdev.dev; ret = watchdog_dev_unregister(wdd); if (ret) diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index 2a3038e..0d204af 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h @@ -12,6 +12,7 @@ #include #include #include +#include #include struct watchdog_ops; @@ -23,6 +24,7 @@ struct watchdog_device; * @start: The routine for starting the watchdog device. * @stop: The routine for stopping the watchdog device. * @ping: The routine that sends a keepalive ping to the watchdog device. + * @reboot: The routine for rebooting the system * @status: The routine that shows the status of the watchdog device. * @set_timeout:The routine for setting the watchdog devices timeout value. * @get_timeleft:The routine that get's the time that's left before a reset. @@ -42,6 +44,8 @@ struct watchdog_ops { int (*stop)(struct watchdog_device *); /* optional operations */ int (*ping)(struct watchdog_device *); + void (*reboot)(struct watchdog_device *, enum reboot_mode, + const char *); unsigned int (*status)(struct watchdog_device *); int (*set_timeout)(struct watchdog_device *, unsigned int); unsigned int (*get_timeleft)(struct watchdog_device *); @@ -142,4 +146,11 @@ extern int watchdog_init_timeout(struct watchdog_device *wdd, extern int watchdog_register_device(struct watchdog_device *); extern void watchdog_unregister_device(struct watchdog_device *); +#ifdef CONFIG_WATCHDOG_CORE +extern void watchdog_do_reboot(enum reboot_mode mode, const char *cmd); +#else +static inline void watchdog_do_reboot(enum reboot_mode mode, + const char *cmd) { } +#endif + #endif /* ifndef _LINUX_WATCHDOG_H */