Generic Watchdog Timer Driver
Subsystems (2)
RFC PATCH 8/10 Generic Watchdog Timer Driver
commit 5752d34c58c9b654c2fa753b94acc67602836420
Author: Wim Van Sebroeck <[email protected]> Date: Sun Jul 18 10:51:52 2010 +0000
watchdog: WatchDog Timer Driver Core - Part 8
Add support for the nowayout feature to the WatchDog Timer Driver Core framework.
This feature prevents the watchdog timer from being stopped.
Documentation/watchdog/src/watchdog-with-timer-example.c +7 -0
@@ -45,6 +45,11 @@ module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. " "(default = " __MODULE_STRING(WDT_TIMEOUT) ")"); +static int nowayout =WATCHDOG_NOWAYOUT ; +module_param (nowayout, int,0 ); +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started. " + "(default = " __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); +static struct watchdog_device wdt_dev;static void wdt_timer_tick (unsigned long data); static DEFINE_TIMER(timer, wdt_timer_tick, 0, 0);
@@ -152,6 +157,8 @@ static int __devinit wdt_probe(struct platform_device *pdev)/* Set watchdog_device parameters */ wdt_dev.timeout = timeout; +if (nowayout) +set_bit (WDOG_NO_WAY_OUT , &wdt_dev.status);/* Register the watchdog timer device */ res =register_watchdogdevice (&wdt_dev);
Documentation/watchdog/watchdog-kernel-api.txt +7 -5
@@ -57,8 +57,8 @@ It contains following fields: WDIOF_* status bits). * status: this field contains a number of status bits that give extra information about the status of the device (Like: is the watchdog timer - running/active, is the device opened via the /dev/watchdog interface or not, - ...) + running/active, is the nowayout bit set, is the device opened via + the /dev/watchdog interface or not, ...) The list of watchdog operations is defined as:
@@ -123,6 +123,8 @@ bit-operations. The status bit's that are defined are: is active or not. When the watchdog is active after booting, then you should set this status bit (Note: when you register the watchdog timer device with this bit set, then opening /dev/watchdog will skip the start operation) +* WDOG_NO_WAY_OUT: this bit stores the nowayout setting for the watchdog. + If this bit is set then the watchdog timer will not be able to stop. * WDOG_DEV_OPEN: this status bit shows whether or not the watchdog device was opened via /dev/watchdog. (This bit should only be used by the WatchDog Timer Driver Core).
@@ -135,6 +137,6 @@ bit-operations. The status bit's that are defined are: has been sent (so that we can support the magic close feature). (This bit should only be used by the WatchDog Timer Driver Core). -Note: The WatchDog Timer Driver Core supports the magic close feauture. To use -the magic close feauture you must set the WDIOF_MAGICCLOSE bit in the options -field of the watchdog's info structure. +Note: The WatchDog Timer Driver Core supports the nowayout feature and the +magic close feauture. To use the magic close feauture you must set the +WDIOF_MAGICCLOSE bit in the options field of the watchdog's info structure.
drivers/watchdog/core/watchdog_dev.c +6 -2
@@ -124,11 +124,15 @@ static int watchdog_start(struct watchdog_device *wddev)* Stop the watchdog if it is still active and unmark it active. * This function returns zero on success or a negative errno code for * failure. +* If the 'nowayout' feature was set, the watchdog cannot be stopped. */ static int watchdog_stop (struct watchdog_device *wddev) { -int err; +int err =-1 ; + +if (test_bit (WDOG_NO_WAY_OUT , &wdd->status)) +return err;if (test_bit (WDOG_ACTIVE , &wdd->status)) { err = wddev->ops->stop (wddev);
@@ -149,7 +153,7 @@ static int watchdog_stop(struct watchdog_device *wddev)* * A write to a watchdog device is defined as a keepalive ping. * Writing the magic 'V' sequence allows the next close to turn -* off the watchdog. +* off the watchdog (if 'nowayout' is not set). */ static ssize_t watchdog_write(struct file *file, const char __user *data,
include/linux/watchdog.h +1 -0
@@ -88,6 +88,7 @@ struct watchdog_device {#define WDOG_ORPHAN 2/* is the device module still loaded * after closing /dev/watchdog */ #define WDOG_EXPECT_RELEASE 3/* did we receive the magic char ? */ +#define WDOG_NO_WAY_OUT 4/* is 'nowayout' feature set ? */ };/* drivers/watchdog/core/watchdog_core.c */
Quoted 47 lines · On Wednesday 23 February 2011, 21:44:36 Wim Van Sebroeck wrote:
commit
5752d34c58c9b654c2fa753b94acc67602836420Author: Wim Van Sebroeck <[email protected]> Date: Sun Jul 18 10:51:52 2010 +0000watchdog: WatchDog Timer Driver Core - Part 8
Add support for the nowayout feature to the WatchDog Timer Driver Core framework.
This feature prevents the watchdog timer from being stopped.Signed-off-by Alan Cox <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>[...]
(quoted diff) +0
-0
b/Documentation/watchdog/watchdog-kernel-api.txtindex 036c30f..91c4299 100644Documentation/watchdog/watchdog-kernel-api.txt +2
-1@@ -57,8 +57,8 @@ It contains following fields: WDIOF_* status bits). * status: this field contains a number of status bits that give extra information about the status of the device (Like: is the watchdog timer - running/active, is the device opened via the /dev/watchdog interface or not, - ...) + running/active, is the nowayout bit set, is the device opened via + the /dev/watchdog interface or not, ...) The list of watchdog operations is defined as:@@ -123,6 +123,8 @@ bit-operations. The status bit's that are defined are: is active or not. When the watchdog is active after booting, then youshould set this status bit (Note: when you register the watchdog timer device with this bit set, then opening
/dev/watchdogwill skip the start operation) +*WDOG_NO_WAY_OUT: this bit stores the nowayout setting for the watchdog. + If this bit is set then the watchdog timer will not be able to stop. *WDOG_DEV_OPEN: this status bit shows whether or not the watchdog device was opened via/dev/watchdog.
(This bit should only be used by the WatchDog Timer Driver Core).Documentation/watchdog/watchdog-kernel-api.txt +0
-1@@ -135,6 +137,6 @@ bit-operations. The status bit's that are defined are: has been sent (so that we can support the magic close feature). (This bit should only be used by the WatchDog Timer Driver Core). -Note: The WatchDog Timer Driver Core supports the magic close feauture. Touse -the magic close feauture you must set the
WDIOF_MAGICCLOSEbit in the options -field of the watchdog's info structure.
Documentation/watchdog/watchdog-kernel-api.txt bit-operations. The status bit's that are defined are: · line 141
Quoted 2 lines
Documentation/watchdog/watchdog-kernel-api.txt +2
-0+Note: The WatchDog Timer Driver Core supports the nowayout feature and the +magic close feauture. To use the magic close feauture you must set the
^ ^
small typos here
Alexander
Hi Alexander,
Quoted 3 lines
Quoted 1 line
+magic close feauture. To use the magic close feauture you must set the
^ ^
small typos here
Fixed in patch 7 and 8.
Thanks,
Wim.