renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-14 16:23:51 +08:00
Code

watchdog: WatchDog Timer Driver Core - Add nowayout feature

Browse Source 
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 <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
Wim Van Sebroeck 2011-07-22 18:59:17 +00:00
parent 017cf08051
commit 7e192b9c42
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/watchdog/watchdog-kernel-api.txt
View File

@ -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:
@ -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:

18
drivers/watchdog/watchdog_dev.c
View File

@ -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);
@ -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,
@ -271,8 +278,8 @@ out:
* @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)
@ -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))

1
include/linux/watchdog.h
View File

@ -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 */