From patchwork Tue Jul 5 19:00:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vkuzmichev@mvista.com X-Patchwork-Id: 946042 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p65J54Ko029829 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 5 Jul 2011 19:05:25 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QeAuw-0006zl-F0; Tue, 05 Jul 2011 19:04:19 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QeAuv-0000Zb-L1; Tue, 05 Jul 2011 19:04:17 +0000 Received: from mail-fx0-f43.google.com ([209.85.161.43]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QeAu0-0000Jo-W0 for linux-arm-kernel@lists.infradead.org; Tue, 05 Jul 2011 19:03:23 +0000 Received: by fxg17 with SMTP id 17so5630103fxg.16 for ; Tue, 05 Jul 2011 12:03:16 -0700 (PDT) Received: by 10.223.145.2 with SMTP id b2mr11776958fav.99.1309892596799; Tue, 05 Jul 2011 12:03:16 -0700 (PDT) Received: from localhost.localdomain (mail.dev.rtsoft.ru [213.79.90.226]) by mx.google.com with ESMTPS id k26sm5493325fak.0.2011.07.05.12.03.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jul 2011 12:03:16 -0700 (PDT) From: Vitaly Kuzmichev To: linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, Russell King , Marc Zyngier , Wim Van Sebroeck Subject: [PATCH V2 2/6] arm_smp_twd: mpcore_wdt: Fix watchdog counter loading Date: Tue, 5 Jul 2011 23:00:36 +0400 Message-Id: <1309892440-3260-3-git-send-email-vkuzmichev@mvista.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1286185540-19569-1-git-send-email-vkuzmichev@mvista.com> References: <1286185540-19569-1-git-send-email-vkuzmichev@mvista.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110705_150321_220344_B20DF235 X-CRM114-Status: GOOD ( 14.19 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.161.43 listed in list.dnswl.org] Cc: Arnd Bergmann , Nicolas Pitre , John Stultz , linux-kernel@vger.kernel.org, arm@kernel.org, Thomas Gleixner , Vitaly Kuzmichev X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 05 Jul 2011 19:05:26 +0000 (UTC) Although the commit "98af057092f8f0dabe63c5df08adc2bbfbddb1d2 ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes" resolved long standing mpcore_wdt driver build problems, it introduced an error in the relationship between the MPcore watchdog timer clock rate and mpcore_margin, "MPcore timer margin in seconds", such that watchdog timeouts are now arbitrary rather than the number of seconds specified by mpcore_margin. This change restores mpcore_wdt_keepalive() to its equivalent implementation prior to commit 98af057 such that watchdog timeouts now occur as specified by mpcore_margin. The variable 'mpcore_timer_rate' which caused that build failure was replaced by 'twd_timer_rate'. Adding exported function to obtain 'twd_timer_rate' value in mpcore_wdt driver. A build error will not occur because MPCORE_WATCHDOG needed to build 'mpcore_wdt' depends on HAVE_ARM_TWD needed to build 'smp_twd'. Signed-off-by: Vitaly Kuzmichev --- drivers/clocksource/arm_smp_twd.c | 13 +++++++++++++ drivers/watchdog/mpcore_wdt.c | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/arm_smp_twd.c b/drivers/clocksource/arm_smp_twd.c index 6acbdac..32f78ff 100644 --- a/drivers/clocksource/arm_smp_twd.c +++ b/drivers/clocksource/arm_smp_twd.c @@ -241,6 +241,19 @@ static void __cpuinit twd_setup(void *data) 0xf, 0xffffffff); } +/* Needed by mpcore_wdt */ +unsigned long twd_timer_get_rate(void) +{ + unsigned long rate; + + if (!IS_ERR_OR_NULL(twd_clk)) + rate = clk_get_rate(twd_clk); + else + rate = twd_timer_rate; + return rate; +} +EXPORT_SYMBOL(twd_timer_get_rate); + static void __cpuinit twd_teardown(void *data) { struct clock_event_device *clk = data; diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c index f638206..7a3d6b2 100644 --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c @@ -33,6 +33,8 @@ #include #include +unsigned long twd_timer_get_rate(void); + #define TWD_WDOG_LOAD 0x20 #define TWD_WDOG_COUNTER 0x24 #define TWD_WDOG_CONTROL 0x28 @@ -104,9 +106,7 @@ static void mpcore_wdt_keepalive(struct mpcore_wdt *wdt) spin_lock(&wdt_lock); /* Assume prescale is set to 256 */ - count = __raw_readl(wdt->base + TWD_WDOG_COUNTER); - count = (0xFFFFFFFFU - count) * (HZ / 5); - count = (count / 256) * mpcore_margin; + count = (twd_timer_get_rate() / 256) * mpcore_margin; /* Reload the counter */ writel(count + wdt->perturb, wdt->base + TWD_WDOG_LOAD);