Skip to content

Commit

Permalink
watchdog: WatchDog Timer Driver Core - Add nowayout feature
Browse files Browse the repository at this point in the history
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]>
Acked-by: Arnd Bergmann <[email protected]>
Acked-by: Wolfram Sang <[email protected]>
  • Loading branch information
Wim Van Sebroeck committed Jul 28, 2011
1 parent 017cf08 commit 7e192b9
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 10 deletions.
13 changes: 8 additions & 5 deletions Documentation/watchdog/watchdog-kernel-api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ It contains following fields:
watchdog_get_drvdata routines.
* 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:

Expand Down Expand Up @@ -130,10 +130,13 @@ bit-operations. The status bits that are defined are:
* WDOG_ALLOW_RELEASE: this bit stores whether or not the magic close character
has been sent (so that we can support the magic close feature).
(This bit should only be used by the WatchDog Timer Driver Core).
* 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.

Note: The WatchDog Timer Driver Core supports the magic close feature. To use
the magic close feature 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 magic close feature and
the nowayout feature. To use the magic close feature you must set the
WDIOF_MAGICCLOSE bit in the options field of the watchdog's info structure.
The nowayout feature will overrule the magic close feature.

To get or set driver specific data the following two helper functions should be
used:
Expand Down
18 changes: 13 additions & 5 deletions drivers/watchdog/watchdog_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,18 @@ 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 = -EBUSY;

if (test_bit(WDOG_NO_WAY_OUT, &wdd->status)) {
pr_info("%s: nowayout prevents watchdog to be stopped!\n",
wdd->info->identity);
return err;
}

if (test_bit(WDOG_ACTIVE, &wdd->status)) {
err = wddev->ops->stop(wddev);
Expand All @@ -123,7 +130,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,
Expand Down Expand Up @@ -271,8 +278,8 @@ static int watchdog_open(struct inode *inode, struct file *file)
* @file: file handle to device
*
* This is the code for when /dev/watchdog gets closed. We will only
* stop the watchdog when we have received the magic char, else the
* watchdog will keep running.
* stop the watchdog when we have received the magic char (and nowayout
* was not set), else the watchdog will keep running.
*/

static int watchdog_release(struct inode *inode, struct file *file)
Expand All @@ -281,7 +288,8 @@ static int watchdog_release(struct inode *inode, struct file *file)

/*
* We only stop the watchdog if we received the magic character
* or if WDIOF_MAGICCLOSE is not set
* or if WDIOF_MAGICCLOSE is not set. If nowayout was set then
* watchdog_stop will fail.
*/
if (test_and_clear_bit(WDOG_ALLOW_RELEASE, &wdd->status) ||
!(wdd->info->options & WDIOF_MAGICCLOSE))
Expand Down
1 change: 1 addition & 0 deletions include/linux/watchdog.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ struct watchdog_device {
#define WDOG_ACTIVE 0 /* Is the watchdog running/active */
#define WDOG_DEV_OPEN 1 /* Opened via /dev/watchdog ? */
#define WDOG_ALLOW_RELEASE 2 /* Did we receive the magic char ? */
#define WDOG_NO_WAY_OUT 3 /* Is 'nowayout' feature set ? */
};

/* Use the following functions to manipulate watchdog driver specific data */
Expand Down

0 comments on commit 7e192b9

Please sign in to comment.