From patchwork Mon Feb 22 16:55:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8380291 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 034C39F372 for ; Mon, 22 Feb 2016 16:58:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 272BA204EB for ; Mon, 22 Feb 2016 16:58:04 +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 063F6204AE for ; Mon, 22 Feb 2016 16:58:03 +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 1aXtmi-0006zY-BQ; Mon, 22 Feb 2016 16:56:32 +0000 Received: from mail-ig0-x234.google.com ([2607:f8b0:4001:c05::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aXtmd-0006ry-TD for linux-arm-kernel@lists.infradead.org; Mon, 22 Feb 2016 16:56:28 +0000 Received: by mail-ig0-x234.google.com with SMTP id 5so86094393igt.0 for ; Mon, 22 Feb 2016 08:56:11 -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=O5Tx+5zqbk5fsmoCDZ3jvOtAKhaGLS8OHI1BxDLA/IQ=; b=DTYppyQXprI3VXm8RyZ3kZ2G2pXTgIynKXXyy/annv2VqqHhjg/2IYzbUZY5dNcmJX vF5H9XmKSSEHiOkn4gPW0ifpBwJB7CfqGoGsTTJXm5zfi3WP1uKnamIp8zndw0WketMm lh3Vnj3p/C8nDmieJYKbHFUYZ0mpeTqTtHf2z66kwD4qCy4AyyaFtG72ECtx0UzR9Otm tUKeJASQZuYCj+0bHtqi+ThugYprdcJA7qIHbxGazzDhggU7udWeUk/MzACS4y1lKBUQ IjwphxNEJKv8eiwKvkZWxH7AfAMk4eYysuDB3J5wGD06dynIE62yUHCSB3IUVzWefR62 Aucw== 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=O5Tx+5zqbk5fsmoCDZ3jvOtAKhaGLS8OHI1BxDLA/IQ=; b=USk4+SSpBE14/6xBsKDMVejIm7FkS6ts5Lc9K3q0gpAnpEbDUFJfyOogYoZoQny6Cx c/sLYcG+5FMH4qTAwAz/pShWLYevJxq58PNcp7MgnbG+JV25HNmkIFSNytaakzvjbfmv cewEmWltZ9y6lIb3hpLkgmS3pD+1sGtXn6M+EbqvLzEysNqR2KhrhQhmtZWVHZXEc/vx 8DB6oMJmA0/M7aCZTbbr9s0oa2oJX4fVCBzhCQqgcNP3gXfSA+frfF3vLBEF9WGe7Tla WzvHn4lgPaZqJ6EylDJ/ew6c+T0nDgy9j8lwcVvYU2Dd7oYVMBi3AXlpqt0+M37oAFd9 r/QA== X-Gm-Message-State: AG10YOTxTZxbQMsT8/hiWcDpIYYTFbCH6rFrkUvFcu0kyhUfSjIK0LJ49C/gg+wQFyEb8g== X-Received: by 10.50.152.41 with SMTP id uv9mr12680255igb.3.1456160171004; Mon, 22 Feb 2016 08:56:11 -0800 (PST) Received: from CABRO3AP00510.americas.tsp.ad ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id x69sm11786084ioi.16.2016.02.22.08.56.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Feb 2016 08:56:09 -0800 (PST) From: slemieux.tyco@gmail.com To: linux-arm-kernel@lists.infradead.org, wim@iguana.be, manabian@gmail.com Subject: [PATCH v2 2/5] watchdog: pnx4008: add restart handler Date: Mon, 22 Feb 2016 11:55:40 -0500 Message-Id: <1456160143-26761-3-git-send-email-slemieux.tyco@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1456160143-26761-1-git-send-email-slemieux.tyco@gmail.com> References: <1456160143-26761-1-git-send-email-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160222_085628_078884_B8F945AD X-CRM114-Status: GOOD ( 14.55 ) 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, 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=-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 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 v1 to v2: - new patch in v2. drivers/watchdog/pnx4008_wdt.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 88264a2..4b01b2b 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -31,7 +31,10 @@ #include #include #include +#include +#include #include +#include /* WatchDog Timer - Chapter 23 Page 207 */ @@ -77,6 +80,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 +128,27 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd, return 0; } +static void pnx4008_wdt_sys_reset(enum reboot_mode mode, const char *cmd) +{ + /* Make sure WDT clocks are enabled */ + writel(LPC32XX_CLKPWR_PWMCLK_WDOG_EN, LPC32XX_CLKPWR_TIMER_CLK_CTRL); + + /* 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); +} + +static int pnx4008_restart_handler(struct notifier_block *this, + unsigned long mode, void *cmd) +{ + pnx4008_wdt_sys_reset((enum reboot_mode)mode, cmd); + + return NOTIFY_DONE; +} + static const struct watchdog_info pnx4008_wdt_ident = { .options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, @@ -157,6 +182,11 @@ 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); + wdt_clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(wdt_clk)) return PTR_ERR(wdt_clk);