From patchwork Thu Mar 3 21:20:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8496241 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 16C15C0553 for ; Thu, 3 Mar 2016 21:22:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AD4120173 for ; Thu, 3 Mar 2016 21:22:45 +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 28DAD20395 for ; Thu, 3 Mar 2016 21:22:44 +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 1abagM-0007TF-8k; Thu, 03 Mar 2016 21:21:14 +0000 Received: from mail-ig0-x242.google.com ([2607:f8b0:4001:c05::242]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1abag6-0007Jf-UY for linux-arm-kernel@lists.infradead.org; Thu, 03 Mar 2016 21:20:59 +0000 Received: by mail-ig0-x242.google.com with SMTP id hb3so549648igb.0 for ; Thu, 03 Mar 2016 13:20:42 -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=RIV/B9KpWAy/5TC44HPcGjeFF0uM1pvpX71GhUuNHHM=; b=L4DQB8fXoIZSn02cYir3UzdsEAQ2visGg/aCGFjj/is/NLwEA41ufxuqkWvP2rWzDc vsCHBphMOOV3syto/Yb804vUlniLU+kcU0WzptkP6jglN9r/TntRrg3ytrmA+uFTl2i5 eRsQ4bOOwcRq0J0dnUoeBim77am/CDEx2mUuog9QqdA87joAFgMyvkSr7+Aa/zVFfwRj UfDs8sj2ySKBuFRae+1FXvml10cgB06277JKwTCsGUzoWM1+VeEJ4ZMkESOwJDSbgERI x6wJA2LIz4+LbG4Gv3eAY4CTjOGZmoFNURjmppqe7Ony1RNi3Um9T4Q3j0q0Dy46LVIV hhrg== 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=RIV/B9KpWAy/5TC44HPcGjeFF0uM1pvpX71GhUuNHHM=; b=AGwjcpFZMwJW/R84WZNBD1kNFgwgwd/T7qBsUCjSJS58qCyH/VaZ7GLsqxeMGslYY/ DLhZVhq+1/v7Oo6nQV4N/DubLcFLkkSf4sBD0V4ZePHuOS3wJaY6SJi3xBmZs2JX5wYB ndL+rEfFcl2TvjHChvUESYCmbUfeTVBpY0VLTmN9qXiH1lc5FyannWZBd+fwrXRRU4yE 7V1SVn8XSWNRpfQzq4JACsP2kAzUYV4pCn2kF8gIiaS7SvB7mcb8gJLKU1UZLAJsTY7o rCPisqezbBCA8hIifviTNZpv5N95oMvKMoMN0ng9Vr+zNjMi0Uq0GIHvThLk6pUmA4wz bZSg== X-Gm-Message-State: AD7BkJLBNLjvr6ow4TKrsyq/Uidx3WsufgMJMoxB2dhVhXfYnkOI+tO35A6BgAjSW8Xa9w== X-Received: by 10.50.142.7 with SMTP id rs7mr63453igb.90.1457040041802; Thu, 03 Mar 2016 13:20:41 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Mar 2016 13:20:40 -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 2/6] watchdog: pnx4008: add restart handler Date: Thu, 3 Mar 2016 16:20:21 -0500 Message-Id: <1457040025-1108-3-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_132059_067510_0CE5DAE3 X-CRM114-Status: GOOD ( 13.10 ) 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 Add restart handler capability to the driver; the restart handler implementation was taken from "mach-lpc32xx" ("lpc23xx_restart" function). Signed-off-by: Sylvain Lemieux Reviewed-by: Guenter Roeck --- Changes from v5 to v6: - none. Changes from v4 to v5: - Rebased on the following patch: http://permalink.gmane.org/gmane.linux.watchdog/3364/ 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 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 88264a2..f3be522 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 */ @@ -124,6 +126,19 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd, return 0; } +static int pnx4008_restart_handler(struct watchdog_device *wdd, + 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, @@ -135,6 +150,7 @@ static const struct watchdog_ops pnx4008_wdt_ops = { .start = pnx4008_wdt_start, .stop = pnx4008_wdt_stop, .set_timeout = pnx4008_wdt_set_timeout, + .restart = pnx4008_restart_handler, }; static struct watchdog_device pnx4008_wdd = { @@ -169,6 +185,7 @@ static int pnx4008_wdt_probe(struct platform_device *pdev) WDIOF_CARDRESET : 0; pnx4008_wdd.parent = &pdev->dev; watchdog_set_nowayout(&pnx4008_wdd, nowayout); + watchdog_set_restart_priority(&pnx4008_wdd, 128); pnx4008_wdt_stop(&pnx4008_wdd); /* disable for now */