From patchwork Thu Feb 25 18:31:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8425801 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 860AB9F52D for ; Thu, 25 Feb 2016 18:34:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B19D4201BC for ; Thu, 25 Feb 2016 18:34:14 +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 E7452202B8 for ; Thu, 25 Feb 2016 18:34:12 +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 1aZ0iT-0000ru-6Z; Thu, 25 Feb 2016 18:32:45 +0000 Received: from mail-io0-x243.google.com ([2607:f8b0:4001:c06::243]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aZ0hw-0000UL-Mn for linux-arm-kernel@lists.infradead.org; Thu, 25 Feb 2016 18:32:14 +0000 Received: by mail-io0-x243.google.com with SMTP id z135so6400188iof.2 for ; Thu, 25 Feb 2016 10:31:55 -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=5AcNCKcXA2ZGdjjK6JWkuv2SD1QOrzR9+y1YiXUH+Go=; b=Od3ui7OU5080z/RuTQj+i63yRdD/x3xMtvODi0ab4y8ccWa1ZLd1RSIvRjUWAkueLl rGWafz6/jZsnZcVchplHv6g5sw5xun4qVHETwmf0JMk5u0rwMOTUSZ7UGgWbcskOJqtx /nbYW/S24Aulofyx86Ew23vFD1zn3qmp99dXsmDnyid5hLsIPZ6ZyqJsiE3sH2qEaEOC N2nBSGgt2a5ACekjcZJMHMwC4snsyOVpw8h16kucQ0LWtmMq+NoY16vzsyOdKAA2G+ze x+zxrrnpbkVP0svy57d7opRyxXMQ9xVid3BbNYyUH11yN4bW6Wfbq06LeiBkCZtsBwhL NYPw== 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=5AcNCKcXA2ZGdjjK6JWkuv2SD1QOrzR9+y1YiXUH+Go=; b=cMUxCeQAmCP4cFLIB3naGd1fG9tdYWk9qHCipJW5IdGeLWF5i+yY9BB6MAvIDpIU1O XFOmMvxL1nhhXkn5pIM/JTMilPcBiQ3UUx5hgEBcFkgSbotrRpi6WjXxcINFSBGYSrhR wqETCu3RmmTVObpbZHAdQmLtQj9r/W/javTZpCgFrfq+Cbe+fsSHf4NjCTFTnZkMYdM/ 2HbPcxak2X02/Uvuk3442J4nf9XAW8W7EhONRBwbSv1Tj8XFLdXwMa6E/D+Xvyw6eFgv i2JRDM9DRvJGAdTDEJ/EuFSk5SacCwn+lkEti5sntcL/kJRqaxlvv/1UQ8v8gcyTSelB /3cA== X-Gm-Message-State: AG10YORsoc396mcQVEUmcl27qL6Rwe3jtFGCJVTqjDRJrm2FuqhibrAs4IOnzZroDdBJTQ== X-Received: by 10.107.138.203 with SMTP id c72mr4848626ioj.107.1456425114965; Thu, 25 Feb 2016 10:31:54 -0800 (PST) Received: from CABRO3AP00510.americas.tsp.ad ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id qa4sm1736299igb.14.2016.02.25.10.31.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Feb 2016 10:31:54 -0800 (PST) From: Sylvain Lemieux To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, wim@iguana.be, manabian@gmail.com Subject: [PATCH v4 2/6] watchdog: pnx4008: add restart handler Date: Thu, 25 Feb 2016 13:31:36 -0500 Message-Id: <1456425100-28136-3-git-send-email-slemieux.tyco@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1456425100-28136-1-git-send-email-slemieux.tyco@gmail.com> References: <1456425100-28136-1-git-send-email-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160225_103213_055944_91A8D193 X-CRM114-Status: GOOD ( 15.54 ) X-Spam-Score: -1.2 (-) 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, linux-watchdog@vger.kernel.org, linux@roeck-us.net, 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=-1.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_SORBS_WEB, UNPARSEABLE_RELAY autolearn=no 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 Add restart handler capability to the driver; the restart handler implementation was taken from "mach-lpc32xx" ("lpc23xx_restart" function). Signed-off-by: Sylvain Lemieux --- Changes from v3 to v4: - none. Changes from v2 to v3: - remove explicit clock enable from restart handler. - verify "register_restart_handler" return value. - add call to unregister_restart_handler". - do the restart handling directly in "pnx4008_restart_handler". Changes from v1 to v2: - new patch in v2. drivers/watchdog/pnx4008_wdt.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 88264a2..80ee4af 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include /* WatchDog Timer - Chapter 23 Page 207 */ @@ -77,6 +79,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; static unsigned int heartbeat = DEFAULT_HEARTBEAT; +static struct notifier_block restart_handler; static DEFINE_SPINLOCK(io_lock); static void __iomem *wdt_base; @@ -124,6 +127,19 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd, return 0; } +static int pnx4008_restart_handler(struct notifier_block *this, + unsigned long mode, void *cmd) +{ + /* Instant assert of RESETOUT_N with pulse length 1mS */ + writel(13000, WDTIM_PULSE(wdt_base)); + writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base)); + + /* Wait for watchdog to reset system */ + mdelay(1000); + + return NOTIFY_DONE; +} + static const struct watchdog_info pnx4008_wdt_ident = { .options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, @@ -157,6 +173,15 @@ static int pnx4008_wdt_probe(struct platform_device *pdev) if (IS_ERR(wdt_base)) return PTR_ERR(wdt_base); + /* Register restart handler. */ + restart_handler.notifier_call = pnx4008_restart_handler; + restart_handler.priority = 128; + ret = register_restart_handler(&restart_handler); + if (ret) { + dev_warn(&pdev->dev, "cannot register restart handler\n"); + return ret; + } + wdt_clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(wdt_clk)) return PTR_ERR(wdt_clk); @@ -189,6 +214,7 @@ disable_clk: static int pnx4008_wdt_remove(struct platform_device *pdev) { + unregister_restart_handler(&restart_handler); watchdog_unregister_device(&pnx4008_wdd); clk_disable_unprepare(wdt_clk);