Skip to content

Commit

Permalink
watchdog: Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Padraig Brady <[email protected]>
Signed-off-by: Wim Van Sebroeck <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
  • Loading branch information
gleehokie authored and Wim Van Sebroeck committed Nov 5, 2011
1 parent 86b5912 commit c63b6d0
Showing 1 changed file with 27 additions and 6 deletions.
33 changes: 27 additions & 6 deletions drivers/watchdog/w83627hf_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static void w83627hf_init(void)
w83627hf_unselect_wd_register();
}

static void wdt_ctrl(int timeout)
static void wdt_set_time(int timeout)
{
spin_lock(&io_lock);

Expand All @@ -158,13 +158,13 @@ static void wdt_ctrl(int timeout)

static int wdt_ping(void)
{
wdt_ctrl(timeout);
wdt_set_time(timeout);
return 0;
}

static int wdt_disable(void)
{
wdt_ctrl(0);
wdt_set_time(0);
return 0;
}

Expand All @@ -176,6 +176,24 @@ static int wdt_set_heartbeat(int t)
return 0;
}

static int wdt_get_time(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)
{
Expand All @@ -202,7 +220,7 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
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,
Expand Down Expand Up @@ -238,14 +256,17 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
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();
return put_user(timeval, p);
default:
return -ENOTTY;
}
Expand Down

0 comments on commit c63b6d0

Please sign in to comment.