From: Vitaly Kuzmichev <vkuzmichev@mvista.com>
To: linux-arm-kernel@lists.infradead.org,
linux-watchdog@vger.kernel.org,
Russell King <linux@arm.linux.org.uk>,
Arnd Bergmann <arnd@arndb.de>, Wim Van Sebroeck <wim@iguana.be>,
Marc Zyngier <marc.zyngier@arm.com>,
Colin Cross <ccross@android.com>
Cc: linux-kernel@vger.kernel.org,
Vitaly Kuzmichev <vkuzmichev@mvista.com>,
Valentine Barshak <vbarshak@mvista.com>
Subject: [PATCH V3 2/4] ARM: smp_twd: mpcore_wdt: Fix watchdog counter loading
Date: Thu, 7 Jul 2011 16:23:14 +0400 [thread overview]
Message-ID: <1310041396-2461-2-git-send-email-vkuzmichev@mvista.com> (raw)
In-Reply-To: <1310041339-2348-1-git-send-email-vkuzmichev@mvista.com>
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.
MPCORE_WATCHDOG needed to build 'mpcore_wdt' already depends on
HAVE_ARM_TWD needed to build 'smp_twd', so from the point of view of
'mpcore_wdt' driver the exported function will always exist.
Signed-off-by: Valentine Barshak <vbarshak@mvista.com>
Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
---
arch/arm/include/asm/smp_twd.h | 1 +
arch/arm/kernel/smp_twd.c | 7 +++++++
drivers/watchdog/mpcore_wdt.c | 4 +---
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h
index fed9981..38130b1 100644
--- a/arch/arm/include/asm/smp_twd.h
+++ b/arch/arm/include/asm/smp_twd.h
@@ -24,5 +24,6 @@ extern void __iomem *twd_base;
int twd_timer_ack(void);
void twd_timer_setup(struct clock_event_device *);
+unsigned long twd_timer_get_rate(void);
#endif
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index 2c277d4..c341ebc 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -142,3 +142,10 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk)
clockevents_register_device(clk);
}
+
+/* Needed by mpcore_wdt */
+unsigned long twd_timer_get_rate(void)
+{
+ return twd_timer_rate;
+}
+EXPORT_SYMBOL(twd_timer_get_rate);
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 2b4af22..efde50b 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -99,9 +99,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);
--
1.7.3.4
next prev parent reply other threads:[~2011-07-07 12:26 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-04 9:45 [PATCH 0/4] ARM: smp_twd: mpcore_wdt: Fix MPCORE watchdog setup vkuzmichev
2010-10-04 9:45 ` [PATCH 1/4] ARM: smp_twd: mpcore_wdt: Fix watchdog counter loading vkuzmichev
2010-10-04 9:45 ` [PATCH 2/4] ARM: smp_twd: Fix typo in twd_timer_rate printout vkuzmichev
2010-10-04 9:45 ` [PATCH 3/4] ARM: mpcore_wdt: Fix WDIOC_SETOPTIONS handling vkuzmichev
2010-10-04 9:45 ` [PATCH 4/4] ARM: mpcore_wdt: Fix timer mode setup vkuzmichev
2011-05-27 8:26 ` [PATCH 0/4] ARM: smp_twd: mpcore_wdt: Fix MPCORE watchdog setup Wim Van Sebroeck
2011-05-27 10:44 ` Marc Zyngier
2011-07-05 19:00 ` [PATCH V2 0/6] arm_smp_twd: " Vitaly Kuzmichev
2011-07-06 10:05 ` Marc Zyngier
2011-07-06 10:14 ` Russell King - ARM Linux
2011-07-06 11:05 ` Catalin Marinas
2011-07-06 11:16 ` Russell King - ARM Linux
2011-07-10 10:39 ` Russell King - ARM Linux
2011-07-11 9:43 ` Catalin Marinas
2011-07-11 9:54 ` Russell King - ARM Linux
2011-07-11 11:06 ` Catalin Marinas
2011-07-06 12:27 ` Vitaly Kuzmichev
2011-07-06 12:39 ` Marc Zyngier
2011-07-06 15:06 ` Vitaly Kuzmichev
2011-07-05 19:00 ` [PATCH V2 1/6] arm_smp_twd: Fix typo in 'twd_timer_rate' printing Vitaly Kuzmichev
2011-07-05 19:00 ` [PATCH V2 2/6] arm_smp_twd: mpcore_wdt: Fix watchdog counter loading Vitaly Kuzmichev
2011-07-06 12:05 ` Arnd Bergmann
2011-07-05 19:00 ` [PATCH V2 3/6] mpcore_wdt: Fix WDIOC_SETOPTIONS handling Vitaly Kuzmichev
2011-07-06 12:05 ` Sergei Shtylyov
2011-07-06 12:22 ` Arnd Bergmann
2011-07-06 13:13 ` Vitaly Kuzmichev
2011-07-06 13:48 ` Russell King - ARM Linux
2011-07-06 13:52 ` Russell King - ARM Linux
2011-07-06 14:19 ` Arnd Bergmann
2011-07-06 15:27 ` Arnd Bergmann
2011-07-06 17:28 ` Wim Van Sebroeck
2011-07-05 19:00 ` [PATCH V2 4/6] mpcore_wdt: Fix timer mode setup Vitaly Kuzmichev
2011-07-05 19:00 ` [PATCH V2 5/6] mpcore_wdt: Add cpufreq notifier to reload counter Vitaly Kuzmichev
2011-07-06 12:09 ` Sergei Shtylyov
2011-07-05 19:00 ` [PATCH V2 6/6] mpcore_wdt: Move declarations in a separate header Vitaly Kuzmichev
2011-07-06 11:58 ` Arnd Bergmann
2011-07-06 12:36 ` Vitaly Kuzmichev
2011-07-06 12:48 ` Arnd Bergmann
2011-07-10 10:42 ` Russell King - ARM Linux
2011-07-06 12:11 ` Sergei Shtylyov
2011-07-07 12:22 ` [PATCH V3 0/4] ARM: smp_twd: mpcore_wdt: Fix MPCORE watchdog setup Vitaly Kuzmichev
2011-07-07 12:23 ` [PATCH V3 1/4] ARM: smp_twd: Fix typo in 'twd_timer_rate' printing Vitaly Kuzmichev
2011-07-07 12:39 ` Russell King - ARM Linux
2011-07-07 12:50 ` Vitaly Kuzmichev
2011-07-07 13:31 ` Vitaly Kuzmichev
2011-07-07 16:20 ` Vitaly Kuzmichev
2011-07-10 10:47 ` Russell King - ARM Linux
2011-07-11 11:50 ` Vitaly Kuzmichev
2011-07-07 12:23 ` Vitaly Kuzmichev [this message]
2011-07-07 12:44 ` [PATCH V3 2/4] ARM: smp_twd: mpcore_wdt: Fix watchdog counter loading Arnd Bergmann
2011-07-07 14:09 ` Vitaly Kuzmichev
2011-07-07 12:23 ` [PATCH V3 3/4] ARM: mpcore_wdt: Fix WDIOC_SETOPTIONS handling Vitaly Kuzmichev
2011-07-07 12:45 ` Arnd Bergmann
2011-07-07 12:23 ` [PATCH V3 4/4] ARM: mpcore_wdt: Fix timer mode setup Vitaly Kuzmichev
2011-07-07 12:46 ` [PATCH V3 0/4] ARM: smp_twd: mpcore_wdt: Fix MPCORE watchdog setup Wim Van Sebroeck
2011-07-07 14:06 ` [PATCH V4 2/4] ARM: smp_twd: mpcore_wdt: Fix watchdog counter loading Vitaly Kuzmichev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310041396-2461-2-git-send-email-vkuzmichev@mvista.com \
--to=vkuzmichev@mvista.com \
--cc=arnd@arndb.de \
--cc=ccross@android.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=marc.zyngier@arm.com \
--cc=vbarshak@mvista.com \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®