From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 01 Dec 2015 14:09:10 +0100 (CET) Received: from proxima.lp0.eu ([81.2.80.65]:54067 "EHLO proxima.lp0.eu" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27006924AbbLANJIlT3pd (ORCPT ); Tue, 1 Dec 2015 14:09:08 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=fire.lp0.eu; s=exim; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:Cc:References:To:Subject; bh=O467nsr8g5gV/tC49Col4ZFy0eop0d4xvEZLqGzfSJw=; b=E/IxqC/UybtqCEmr5Du87J1yrbJmvXr7QJBxpcP+RWa019rhOCtx3oIA/bPvrgFOTWnfX1zCHWi1XpHy234EBCqDD0RPnLBlQnIf6zGRmEKLGAONHHyAWuj6g905ukE4OJSNY2XEznypWVOXkZdZCBwBSdzyjtnv1aYQjQG72Zho/92pInF7Gx5bxMVZPiY14IjxnLhzhPsBU46FnLLZL/VNLVPcf5L2z+6jSLWS4+LR7ttyChTdd0Ds1kMpw7zIluMoloLaaG/qJ94QVgW0CQVZX1xNBklGIe0d08Og9/HPsQ6FU9Hlh72hphdhYYgjerzNBPZekvGGWXNY4tOwIg==; Received: from redrum.lp0.eu ([2001:8b0:ffea:0:2e0:81ff:fe4d:2bec]:45589 ident=simon) by proxima.lp0.eu ([2001:8b0:ffea:0:205:b4ff:fe12:530]:465) with esmtpsav (UNKNOWN:DHE-RSA-AES256-SHA:256/CN=Simon Arlott) id 1a3kfz-0008Kg-K7 (Exim); Tue, 01 Dec 2015 13:09:00 +0000 Subject: [PATCH 08/11] watchdog: bcm63xx_wdt: Warn if the watchdog is currently running To: Guenter Roeck , Thomas Gleixner References: <565D9A40.60409@simon.arlott.org.uk> Cc: Florian Fainelli , MIPS Mailing List , Jonas Gorski , "devicetree@vger.kernel.org" , Ralf Baechle , Jason Cooper , Marc Zyngier , Kevin Cernekee , Wim Van Sebroeck , Maxime Bizon , Linux Kernel Mailing List , linux-watchdog@vger.kernel.org, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala From: Simon Arlott Message-ID: <565D9BE9.4060008@simon.arlott.org.uk> Date: Tue, 1 Dec 2015 13:08:57 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <565D9A40.60409@simon.arlott.org.uk> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 50259 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: simon@fire.lp0.eu Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips Warn when the device is registered if the hardware watchdog is currently running and report the remaining time left. Signed-off-by: Simon Arlott --- drivers/watchdog/bcm63xx_wdt.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c index ab4a794..2312dc2 100644 --- a/drivers/watchdog/bcm63xx_wdt.c +++ b/drivers/watchdog/bcm63xx_wdt.c @@ -14,6 +14,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include +#include #include #include #include @@ -159,6 +160,8 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) struct bcm63xx_wdt_hw *hw; struct watchdog_device *wdd; struct resource *r; + u32 timeleft1, timeleft2; + unsigned int timeleft; int ret; hw = devm_kzalloc(&pdev->dev, sizeof(*hw), GFP_KERNEL); @@ -199,7 +202,6 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) } raw_spin_lock_init(&hw->lock); - hw->running = false; wdd->parent = &pdev->dev; wdd->ops = &bcm63xx_wdt_ops; @@ -213,6 +215,23 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) watchdog_init_timeout(wdd, 0, &pdev->dev); watchdog_set_nowayout(wdd, nowayout); + /* Compare two reads of the time left value, 2 clock ticks apart */ + rmb(); + timeleft1 = __raw_readl(hw->regs + WDT_CTL_REG); + udelay(DIV_ROUND_UP(1000000, hw->clock_hz / 2)); + /* Ensure the register is read twice */ + rmb(); + timeleft2 = __raw_readl(hw->regs + WDT_CTL_REG); + + /* If the time left is changing, the watchdog is running */ + if (timeleft1 != timeleft2) { + hw->running = true; + timeleft = bcm63xx_wdt_get_timeleft(wdd); + } else { + hw->running = false; + timeleft = 0; + } + ret = watchdog_register_device(wdd); if (ret < 0) { dev_err(&pdev->dev, "failed to register watchdog device\n"); @@ -230,6 +249,8 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) dev_name(wdd->dev), hw->regs, wdd->timeout, wdd->max_timeout); + if (hw->running) + dev_alert(wdd->dev, "running, reboot in %us\n", timeleft); return 0; unregister_watchdog: -- 2.1.4 -- Simon Arlott