* [PATCH] shwdt: fix usage of mod_timer
@ 2011-07-20 13:03 David Engraf
2011-07-21 7:53 ` Paul Mundt
0 siblings, 1 reply; 3+ messages in thread
From: David Engraf @ 2011-07-20 13:03 UTC (permalink / raw)
To: Wim Van Sebroeck, linux-watchdog, linux-kernel, linux-sh,
Paul Mundt
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
This patch fixes the usage of mod_timer and makes the driver usable.
mod_timer must be called with an absolute timeout in jiffies, the old
implementation used a relative timeout thus the hardware watchdog was
never triggered.
Signed-off-by: David Engraf <david.engraf@sysgo.com>
[-- Attachment #2: shwdt.patch --]
[-- Type: text/x-diff, Size: 525 bytes --]
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index db84f23..a267dc0 100644
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -64,7 +64,7 @@
* misses its deadline, the kernel timer will allow the WDT to overflow.
*/
static int clock_division_ratio = WTCSR_CKS_4096;
-#define next_ping_period(cks) msecs_to_jiffies(cks - 4)
+#define next_ping_period(cks) (jiffies + msecs_to_jiffies(cks - 4))
static const struct watchdog_info sh_wdt_info;
static struct platform_device *sh_wdt_dev;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] shwdt: fix usage of mod_timer
2011-07-20 13:03 [PATCH] shwdt: fix usage of mod_timer David Engraf
@ 2011-07-21 7:53 ` Paul Mundt
2011-07-22 18:32 ` Wim Van Sebroeck
0 siblings, 1 reply; 3+ messages in thread
From: Paul Mundt @ 2011-07-21 7:53 UTC (permalink / raw)
To: David Engraf; +Cc: Wim Van Sebroeck, linux-watchdog, linux-kernel, linux-sh
On Wed, Jul 20, 2011 at 03:03:39PM +0200, David Engraf wrote:
> This patch fixes the usage of mod_timer and makes the driver usable.
> mod_timer must be called with an absolute timeout in jiffies, the old
> implementation used a relative timeout thus the hardware watchdog was
> never triggered.
>
> Signed-off-by: David Engraf <david.engraf@sysgo.com>
>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] shwdt: fix usage of mod_timer
2011-07-21 7:53 ` Paul Mundt
@ 2011-07-22 18:32 ` Wim Van Sebroeck
0 siblings, 0 replies; 3+ messages in thread
From: Wim Van Sebroeck @ 2011-07-22 18:32 UTC (permalink / raw)
To: Paul Mundt; +Cc: David Engraf, linux-watchdog, linux-kernel, linux-sh
Hi Paul,
> On Wed, Jul 20, 2011 at 03:03:39PM +0200, David Engraf wrote:
> > This patch fixes the usage of mod_timer and makes the driver usable.
> > mod_timer must be called with an absolute timeout in jiffies, the old
> > implementation used a relative timeout thus the hardware watchdog was
> > never triggered.
> >
> > Signed-off-by: David Engraf <david.engraf@sysgo.com>
> >
> Applied, thanks.
So this patch will go via your tree then.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-22 18:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-20 13:03 [PATCH] shwdt: fix usage of mod_timer David Engraf
2011-07-21 7:53 ` Paul Mundt
2011-07-22 18:32 ` Wim Van Sebroeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox