3 files changed, 79 insertions, 2 deletions

diff --git a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c
index fa2ba9ebe42a..bfbdbbf3c2f2 100644
--- a/drivers/char/watchdog/i8xx_tco.c
+++ b/drivers/char/watchdog/i8xx_tco.c
@@ -205,6 +205,23 @@ static int tco_timer_set_heartbeat (int t)
         return 0;
 }
 
+static int tco_timer_get_timeleft (int *time_left)
+{
+        unsigned char val;
+
+        spin_lock(&tco_lock);
+
+        /* read the TCO Timer */
+        val = inb (TCO1_RLD);
+        val &= 0x3f;
+
+        spin_unlock(&tco_lock);
+
+        *time_left = (int)((val * 6) / 10);
+
+        return 0;
+}
+
 /*
  *      /dev/watchdog handling
  */
@@ -272,6 +289,7 @@ static int i8xx_tco_ioctl (struct inode *inode, struct file *file,
 {
         int new_options, retval = -EINVAL;
         int new_heartbeat;
+        int time_left;
         void __user *argp = (void __user *)arg;
         int __user *p = argp;
         static struct watchdog_info ident = {
@@ -320,7 +338,7 @@ static int i8xx_tco_ioctl (struct inode *inode, struct file *file,
                                 return -EFAULT;
 
                         if (tco_timer_set_heartbeat(new_heartbeat))
-                            return -EINVAL;
+                                return -EINVAL;
 
                         tco_timer_keepalive ();
                         /* Fall */
@@ -329,6 +347,14 @@ static int i8xx_tco_ioctl (struct inode *inode, struct file *file,
                 case WDIOC_GETTIMEOUT:
                         return put_user(heartbeat, p);
 
+                case WDIOC_GETTIMELEFT:
+                {
+                        if (tco_timer_get_timeleft(&time_left))
+                                return -EINVAL;
+
+                        return put_user(time_left, p);
+                }
+
                 default:
                         return -ENOIOCTLCMD;
         }
diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/char/watchdog/pcwd_pci.c
index 2451edbefece..1f40ecefbf72 100644
--- a/drivers/char/watchdog/pcwd_pci.c
+++ b/drivers/char/watchdog/pcwd_pci.c
@@ -21,7 +21,7 @@
  */
 
 /*
- *      A bells and whistles driver is available from: 
+ *      A bells and whistles driver is available from:
  *      http://www.kernel.org/pub/linux/kernel/people/wim/pcwd/pcwd_pci/
  *
  *      More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/
@@ -390,6 +390,24 @@ static int pcipcwd_get_temperature(int *temperature)
         return 0;
 }
 
+static int pcipcwd_get_timeleft(int *time_left)
+{
+        int msb;
+        int lsb;
+
+        /* Read the time that's left before rebooting */
+        /* Note: if the board is not yet armed then we will read 0xFFFF */
+        send_command(CMD_READ_WATCHDOG_TIMEOUT, &msb, &lsb);
+
+        *time_left = (msb << 8) + lsb;
+
+        if (debug >= VERBOSE)
+                printk(KERN_DEBUG PFX "Time left before next reboot: %d\n",
+                       *time_left);
+
+        return 0;
+}
+
 /*
  *      /dev/watchdog handling
  */
@@ -512,6 +530,16 @@ static int pcipcwd_ioctl(struct inode *inode, struct file *file,
                 case WDIOC_GETTIMEOUT:
                         return put_user(heartbeat, p);
 
+                case WDIOC_GETTIMELEFT:
+                {
+                        int time_left;
+
+                        if (pcipcwd_get_timeleft(&time_left))
+                                return -EFAULT;
+
+                        return put_user(time_left, p);
+                }
+
                 default:
                         return -ENOIOCTLCMD;
         }
diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c
index 3fdfda9324fa..0d072bed501d 100644
--- a/drivers/char/watchdog/pcwd_usb.c
+++ b/drivers/char/watchdog/pcwd_usb.c
@@ -317,6 +317,19 @@ static int usb_pcwd_get_temperature(struct usb_pcwd_private *usb_pcwd, int *temp
         return 0;
 }
 
+static int usb_pcwd_get_timeleft(struct usb_pcwd_private *usb_pcwd, int *time_left)
+{
+        unsigned char msb, lsb;
+
+        /* Read the time that's left before rebooting */
+        /* Note: if the board is not yet armed then we will read 0xFFFF */
+        usb_pcwd_send_command(usb_pcwd, CMD_READ_WATCHDOG_TIMEOUT, &msb, &lsb);
+
+        *time_left = (msb << 8) + lsb;
+
+        return 0;
+}
+
 /*
  *      /dev/watchdog handling
  */
@@ -422,6 +435,16 @@ static int usb_pcwd_ioctl(struct inode *inode, struct file *file,
                 case WDIOC_GETTIMEOUT:
                         return put_user(heartbeat, p);
 
+                case WDIOC_GETTIMELEFT:
+                {
+                        int time_left;
+
+                        if (usb_pcwd_get_timeleft(usb_pcwd_device, &time_left))
+                                return -EFAULT;
+
+                        return put_user(time_left, p);
+                }
+
                 default:
                         return -ENOIOCTLCMD;
         }