From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932790AbcASJSb (ORCPT ); Tue, 19 Jan 2016 04:18:31 -0500 Received: from mail-pf0-f179.google.com ([209.85.192.179]:34063 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932389AbcASJS1 (ORCPT ); Tue, 19 Jan 2016 04:18:27 -0500 Date: Tue, 19 Jan 2016 14:48:24 +0530 From: Viresh Kumar To: Sandeep Tripathy Cc: wim@iguana.be, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com Subject: Re: [PATCH v2 1/1] watchdog: sp805: ping fails to abort wdt reset Message-ID: <20160119091824.GC22443@vireshk> References: <1453194889-27860-1-git-send-email-tripathy@broadcom.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1453194889-27860-1-git-send-email-tripathy@broadcom.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 19-01-16, 14:44, Sandeep Tripathy wrote: > 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 > --- > 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); Acked-by: Viresh Kumar -- viresh