v2.6.33-rc8 - bfin_wdt.c : fix max timeout calculation
Hi Linus,
Please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
This will update the following files:
drivers/watchdog/bfin_wdt.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
with these Changes:
Author: Mike Frysinger <[email protected]> Date: Mon Feb 15 19:32:25 2010 -0500
[WATCHDOG] bfin: fix max timeout calculation
Relying on overflow/wrap around isn't exact because if you wrap far enough, you get back to "valid" values.
Reported-by Thorsten Pohlmann <[email protected]>
Signed-off-by Mike Frysinger <[email protected]>
Signed-off-by Wim Van Sebroeck <[email protected]>
Cc stable <[email protected]>
The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary
For completeness, I added the overal diff below.
Greetings,
Wim.
================================================================================
drivers/watchdog/bfin_wdt.c +7 -6
@@ -1,9 +1,8 @@/* * Blackfin On-Chip Watchdog Driver -* Supports BF53[123]/BF53[467]/BF54[2489]/BF561 * * Originally based on softdog.c -* Copyright 2006-2007 Analog Devices Inc. +* Copyright 2006-2010 Analog Devices Inc. * Copyright 2006-2007 Michele d'Amico * Copyright 1996 Alan Cox <[email protected]> *
@@ -137,13 +136,15 @@ static int bfin_wdt_running(void)*/ static int bfin_wdt_set_timeout (unsigned long t) { -u32 cnt; +u32 cnt, max_t, sclk;unsigned long flags; -stampit (); + sclk =get_sclk (); + max_t =-1 / sclk; + cnt = t * sclk; +stamp ("maxtimeout=%us newtimeout=%lus (cnt=%#x)" , max_t, t, cnt); - cnt = t *get_sclk (); -if (cnt <get_sclk ()) { +if (t > max_t) { printk(KERN_WARNING PFX "timeout value is too large\n");return -EINVAL ; }