public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

watchdog: softdog: implement pretimeout support

Browse source 
Give devices which do not have hardware support for pretimeout at least a
software version of it.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Wolfram Sang 2016-10-07 15:41:38 +03:00 • committed by Wim Van Sebroeck
parent 89873a711d
commit 2accf32078
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/watchdog/softdog.c
View file

@ -72,10 +72,27 @@ static void softdog_fire(unsigned long data)
static struct timer_list softdog_ticktock = static struct timer_list softdog_ticktock =
TIMER_INITIALIZER(softdog_fire, 0, 0); TIMER_INITIALIZER(softdog_fire, 0, 0);
static struct watchdog_device softdog_dev;
static void softdog_pretimeout(unsigned long data)
{
watchdog_notify_pretimeout(&softdog_dev);
}
static struct timer_list softdog_preticktock =
TIMER_INITIALIZER(softdog_pretimeout, 0, 0);
static int softdog_ping(struct watchdog_device *w) static int softdog_ping(struct watchdog_device *w)
{ {
if (!mod_timer(&softdog_ticktock, jiffies + (w->timeout * HZ))) if (!mod_timer(&softdog_ticktock, jiffies + (w->timeout * HZ)))
__module_get(THIS_MODULE); __module_get(THIS_MODULE);
if (w->pretimeout)
mod_timer(&softdog_preticktock, jiffies +
(w->timeout - w->pretimeout) * HZ);
else
del_timer(&softdog_preticktock);
return 0; return 0;
} }
@ -84,12 +101,15 @@ static int softdog_stop(struct watchdog_device *w)
if (del_timer(&softdog_ticktock)) if (del_timer(&softdog_ticktock))
module_put(THIS_MODULE); module_put(THIS_MODULE);
del_timer(&softdog_preticktock);
return 0; return 0;
} }
static struct watchdog_info softdog_info = { static struct watchdog_info softdog_info = {
.identity = "Software Watchdog", .identity = "Software Watchdog",
.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE |
WDIOF_PRETIMEOUT,
}; };
static const struct watchdog_ops softdog_ops = { static const struct watchdog_ops softdog_ops = {