watchdog: hpwdt (7/12): allow full range of timer values supported by hardware
authordann frazier <dannf@hp.com>
Wed, 2 Jun 2010 22:23:40 +0000 (16:23 -0600)
committerWim Van Sebroeck <wim@iguana.be>
Fri, 13 Aug 2010 20:54:42 +0000 (20:54 +0000)
The hpwdt timer is a 16 bit value with 128ms resolution.
Let applications use this entire range.

Signed-off-by: dann frazier <dannf@hp.com>
Acked-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/hpwdt.c

index a5d36ae350ddf8132d6f8d20961b97e32ac12600..00299919df398173bcd3f5031ca6219b18e6a6ad 100644 (file)
@@ -36,6 +36,8 @@
 
 #define HPWDT_VERSION                  "1.1.1"
 #define SECS_TO_TICKS(secs)            ((secs) * 1000 / 128)
+#define TICKS_TO_SECS(ticks)           ((ticks) * 128 / 1000)
+#define HPWDT_MAX_TIMER                        TICKS_TO_SECS(65535)
 #define DEFAULT_MARGIN                 30
 
 static unsigned int soft_margin = DEFAULT_MARGIN;      /* in seconds */
@@ -432,8 +434,7 @@ static void hpwdt_ping(void)
 
 static int hpwdt_change_timer(int new_margin)
 {
-       /* Arbitrary, can't find the card's limits */
-       if (new_margin < 5 || new_margin > 600) {
+       if (new_margin < 1 || new_margin > HPWDT_MAX_TIMER) {
                printk(KERN_WARNING
                        "hpwdt: New value passed in is invalid: %d seconds.\n",
                        new_margin);