From patchwork Tue Aug 5 01:48:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 4675001 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8B6739F38C for ; Tue, 5 Aug 2014 01:51:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C7F0E2017D for ; Tue, 5 Aug 2014 01:51:42 +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 913622015A for ; Tue, 5 Aug 2014 01:51:40 +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 1XETsy-0007ww-Gb; Tue, 05 Aug 2014 01:49:56 +0000 Received: from mail-pd0-x22b.google.com ([2607:f8b0:400e:c02::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XETsh-0007fK-AE for linux-arm-kernel@lists.infradead.org; Tue, 05 Aug 2014 01:49:39 +0000 Received: by mail-pd0-f171.google.com with SMTP id z10so365817pdj.2 for ; Mon, 04 Aug 2014 18:49:22 -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=bXWCTHl7AG5MqGJQf0A6bgHdEkmVZUaF/ep+QyIrUWM=; b=v7Fe2MZOLgmoTuepY8CyQYa8IK4DD/QKyqQN7zFOD4tWS4CVOD6XdUO9isSx7PbyON NAG++R1cbDIQhLmI+5Bbazsh+01SyS1STq8k69rNd48zAH44rsCievC4orkDo448Gkyo ivdvFMegGyE5FGPfYT4bVK6y2C4X12cVFoRb7Ph+iSOEOujqJ1Tp2/vMXyy/zFSH4IHr XZzkccNH0/fNnGa5h1SbIVq899rZtfVAAKHRSiGIRF1RgK9ivai/ZtpEjvaxVEnSqD6n 5cfAo7J/te1nusvHWCeTQcCh/RRjwZkLpRRlyPGSDpKQMu7NU0cScqgPiViK3MqOcLOQ x3RQ== X-Received: by 10.70.118.197 with SMTP id ko5mr643252pdb.64.1407203362101; Mon, 04 Aug 2014 18:49:22 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id be7sm312173pdb.37.2014.08.04.18.49.20 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 18:49:21 -0700 (PDT) From: Guenter Roeck To: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 5/7] watchdog: moxart: Register restart handler with kernel restart handler Date: Mon, 4 Aug 2014 18:48:56 -0700 Message-Id: <1407203338-12915-6-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407203338-12915-1-git-send-email-linux@roeck-us.net> References: <1407203338-12915-1-git-send-email-linux@roeck-us.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140804_184939_378548_38C5E3A9 X-CRM114-Status: GOOD ( 15.85 ) X-Spam-Score: -0.4 (/) Cc: Ingo Molnar , Russell King , Heiko Stuebner , Arnd Bergmann , linux-doc@vger.kernel.org, Dmitry Eremin-Solenikov , Catalin Marinas , Tomasz Figa , Randy Dunlap , Will Deacon , linux-kernel@vger.kernel.org, Steven Rostedt , Jonas Jensen , Wim Van Sebroeck , Maxime Ripard , David Woodhouse , Andrew Morton , Guenter Roeck X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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.5 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 The kernel now provides an API to trigger a system restart. Register with it instead of setting arm_pm_restart. Signed-off-by: Guenter Roeck Acked-by: Catalin Marinas Acked-by: Heiko Stuebner --- v6: No change. v5: Functions and variables renamed: *notifier -> *handler v4: Set notifier priority to 128. v3: Move struct notifier_block into struct moxart_wdt_dev. Drop static variable previously needed to access struct moxart_wdt_dev from notifier function; use container_of instead. v2: No change. drivers/watchdog/moxart_wdt.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c index 4aa3a8a..a64405b 100644 --- a/drivers/watchdog/moxart_wdt.c +++ b/drivers/watchdog/moxart_wdt.c @@ -15,12 +15,12 @@ #include #include #include +#include #include +#include #include #include -#include - #define REG_COUNT 0x4 #define REG_MODE 0x8 #define REG_ENABLE 0xC @@ -29,17 +29,22 @@ struct moxart_wdt_dev { struct watchdog_device dev; void __iomem *base; unsigned int clock_frequency; + struct notifier_block restart_handler; }; -static struct moxart_wdt_dev *moxart_restart_ctx; - static int heartbeat; -static void moxart_wdt_restart(enum reboot_mode reboot_mode, const char *cmd) +static int moxart_restart_handle(struct notifier_block *this, + unsigned long mode, void *cmd) { - writel(1, moxart_restart_ctx->base + REG_COUNT); - writel(0x5ab9, moxart_restart_ctx->base + REG_MODE); - writel(0x03, moxart_restart_ctx->base + REG_ENABLE); + struct moxart_wdt_dev *moxart_wdt = container_of(this, + struct moxart_wdt_dev, + restart_handler); + writel(1, moxart_wdt->base + REG_COUNT); + writel(0x5ab9, moxart_wdt->base + REG_MODE); + writel(0x03, moxart_wdt->base + REG_ENABLE); + + return NOTIFY_DONE; } static int moxart_wdt_stop(struct watchdog_device *wdt_dev) @@ -136,8 +141,12 @@ static int moxart_wdt_probe(struct platform_device *pdev) if (err) return err; - moxart_restart_ctx = moxart_wdt; - arm_pm_restart = moxart_wdt_restart; + moxart_wdt->restart_handler.notifier_call = moxart_restart_handle; + moxart_wdt->restart_handler.priority = 128; + err = register_restart_handler(&moxart_wdt->restart_handler); + if (err) + dev_err(dev, "cannot register restart notifier (err=%d)\n", + err); dev_dbg(dev, "Watchdog enabled (heartbeat=%d sec, nowayout=%d)\n", moxart_wdt->dev.timeout, nowayout); @@ -149,9 +158,8 @@ static int moxart_wdt_remove(struct platform_device *pdev) { struct moxart_wdt_dev *moxart_wdt = platform_get_drvdata(pdev); - arm_pm_restart = NULL; + unregister_restart_handler(&moxart_wdt->restart_handler); moxart_wdt_stop(&moxart_wdt->dev); - watchdog_unregister_device(&moxart_wdt->dev); return 0; }