Groups > linux.kernel > #1312035

[PATCH v2 1/1] watchdog: sp805: ping fails to abort wdt reset

Path	csiph.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod
From	Sandeep Tripathy <tripathy@broadcom.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 1/1] watchdog: sp805: ping fails to abort wdt reset
Date	Tue, 19 Jan 2016 10:20:02 +0100
Message-ID	<qSACd-5IF-11@gated-at.bofh.it> (permalink)
X-Ironport-Av	E=Sophos;i="5.22,316,1449561600"; d="scan'208";a="85878113"
X-Mailer	git-send-email 1.7.9.5
MIME-Version	1.0
Content-Type	text/plain
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	38
Organization	linux.* mail to news gateway
X-Original-Cc	<viresh.kumar@linaro.org>, <linux-watchdog@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <bcm-kernel-feedback-list@broadcom.com>, Sandeep Tripathy <tripathy@broadcom.com>
X-Original-Date	Tue, 19 Jan 2016 14:44:49 +0530
X-Original-Message-ID	<1453194889-27860-1-git-send-email-tripathy@broadcom.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1312035

Show key headers only | View raw

sp805 wdt asserts interrupt for the first expiry and
reloads the counter. If wdt interrupt is set and count
reaches zero then wdt reset event is generated. To get
wdt reset at 't' timeout the driver loads wdt counter
with 't/2'. A ping before time 't'  *should* prevent
wdt reset. Currently if ping is done after 't/2' then
wdt interrupt condition gets set. On the next countdown
of loadval wdt reset event occurs eventhough wdt was
reloaded before the set timeout 't'.

This patch clears the interrupt condition on ping.

Signed-off-by: Sandeep Tripathy <tripathy@broadcom.com>
---
 drivers/watchdog/sp805_wdt.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 01d8162..e7a715e 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -139,12 +139,11 @@ static int wdt_config(struct watchdog_device *wdd, bool ping)
 
 	writel_relaxed(UNLOCK, wdt->base + WDTLOCK);
 	writel_relaxed(wdt->load_val, wdt->base + WDTLOAD);
+	writel_relaxed(INT_MASK, wdt->base + WDTINTCLR);
 
-	if (!ping) {
-		writel_relaxed(INT_MASK, wdt->base + WDTINTCLR);
+	if (!ping)
 		writel_relaxed(INT_ENABLE | RESET_ENABLE, wdt->base +
 				WDTCONTROL);
-	}
 
 	writel_relaxed(LOCK, wdt->base + WDTLOCK);
 
-- 
1.7.9.5

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/1] watchdog: sp805: ping fails to abort wdt reset Sandeep Tripathy <tripathy@broadcom.com> - 2016-01-19 10:20 +0100
  Re: [PATCH v2 1/1] watchdog: sp805: ping fails to abort wdt reset Guenter Roeck <linux@roeck-us.net> - 2016-01-19 14:10 +0100

csiph-web