linux-kernel - [PATCH] Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 12 Sep 2011 01:10:17 -0400
From:	Greg Lee <glee@...pec.com>
To:	linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver

Add WDIOC_GETTIMELEFT ioctl allowing you to check how much time is left
on the watchdog counter before a reset occurs.

Signed-off-by: Greg Lee <glee [at] swspec.com>

---
--- linux-3.1-rc5.orig/drivers/watchdog/w83627hf_wdt.c
+++ linux-3.1-rc5.mine/drivers/watchdog/w83627hf_wdt.c
@@ -176,6 +176,23 @@ static int wdt_set_heartbeat(int t)
        return 0;
 }

+static int wdt_get_time_left(void){
+       int timeleft;
+
+       spin_lock(&io_lock);
+
+       w83627hf_select_wd_register();
+
+       outb_p(0xF6, WDT_EFER);    /* Select CRF6 */
+       timeleft = inb_p(WDT_EFDR); /* Read Timeout counter to CRF6 */
+
+       w83627hf_unselect_wd_register();
+
+       spin_unlock(&io_lock);
+
+       return timeleft;
+}
+
 static ssize_t wdt_write(struct file *file, const char __user *buf,
                                                size_t count, loff_t *ppos)
 {
@@ -202,7 +219,7 @@ static long wdt_ioctl(struct file *file,
 {
        void __user *argp = (void __user *)arg;
        int __user *p = argp;
-       int new_timeout;
+       int timeval;
        static const struct watchdog_info ident = {
                .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT |
                                                        WDIOF_MAGICCLOSE,
@@ -238,14 +255,17 @@ static long wdt_ioctl(struct file *file,
                wdt_ping();
                break;
        case WDIOC_SETTIMEOUT:
-               if (get_user(new_timeout, p))
+               if (get_user(timeval, p))
                        return -EFAULT;
-               if (wdt_set_heartbeat(new_timeout))
+               if (wdt_set_heartbeat(timeval))
                        return -EINVAL;
                wdt_ping();
                /* Fall */
        case WDIOC_GETTIMEOUT:
                return put_user(timeout, p);
+       case WDIOC_GETTIMELEFT:
+               timeval = wdt_get_time_left();
+               return put_user(timeval, p);
        default:
                return -ENOTTY;
        }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/