watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API
Subsystems (4)
PATCH 1/1 watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API
Add two nowayout helpers for the Watchdog Timer Driver Kernel API.
---
Documentation/watchdog/00-INDEX +2 -0
@@ -1,5 +1,7 @@ 00-INDEX - this file. +convert_drivers_to_kernel_api.txt + - how-to for converting old watchdog drivers to the new kernel API. hpwdt.txt - information on the HP iLO2 NMI watchdog pcwd-watchdog.txt
Documentation/watchdog/watchdog-kernel-api.txt +9 -1
@@ -1,6 +1,6 @@ The Linux WatchDog Timer Driver Core kernel API. =============================================== -Last reviewed: 22-Jul-2011 +Last reviewed: 29-Nov-2011 Wim Van Sebroeck <[email protected]>
@@ -142,6 +142,14 @@ bit-operations. The status bits that are defined are: * 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. +To set the WDOG_NO_WAY_OUT status bit (before registering your watchdog +timer device) you can either: +* set it statically in your watchdog_device struct with + .status = WATCHDOG_NOWAYOUT_INIT_STATUS, + (this will set the value the same as CONFIG_WATCHDOG_NOWAYOUT) or +* use the following helper function: +static inline void watchdog_set_nowayout(struct watchdog_device *wdd, int nowayout) + 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.
include/linux/watchdog.h +16 -5
@@ -53,11 +53,7 @@ struct watchdog_info {#ifdef __KERNEL__ -#ifdef CONFIG_WATCHDOG_NOWAYOUT -#define WATCHDOG_NOWAYOUT 1 -#else -#define WATCHDOG_NOWAYOUT 0 -#endif +#include <linux/bitops.h> struct watchdog_ops ;struct watchdog_device ;
@@ -122,6 +118,21 @@ struct watchdog_device {#define WDOG_NO_WAY_OUT 3/* Is 'nowayout' feature set ? */ }; +#ifdef CONFIG_WATCHDOG_NOWAYOUT +#define WATCHDOG_NOWAYOUT 1 +#define WATCHDOG_NOWAYOUT_INIT_STATUS (1 << WDOG_NO_WAY_OUT) +#else +#define WATCHDOG_NOWAYOUT 0 +#define WATCHDOG_NOWAYOUT_INIT_STATUS 0 +#endif + +/* Use the following function to set the nowayout feature */ +static inline void watchdog_set_nowayout (struct watchdog_device *wdd,int nowayout) +{ +if (nowayout) +set_bit (WDOG_NO_WAY_OUT , &wdd->status); +} +/* Use the following functions to manipulate watchdog driver specific data */ static inline void watchdog_set_drvdata (struct watchdog_device *wdd,void *data) {
Documentation/watchdog/00-INDEX line 4
Quoted 13 lines · Wim Van Sebroeck
Add two nowayout helpers for the Watchdog Timer Driver Kernel API.
Signed-off-by Wim Van Sebroeck <[email protected]>---
Documentation/watchdog/00-INDEX +2
-0@@ -1,5 +1,7 @@ 00-INDEX - this file. +convert_drivers_to_kernel_api.txt + - how-to for converting old watchdog drivers to the new kernel API.
Since the howto needs a NOWAYOUT-update as well, I suggest I'll send a patch for that and take care of the missing index-entry there?
Documentation/watchdog/00-INDEX bit-operations. The status bits that are defined are: · line 152
Quoted 12 lines
Documentation/watchdog/00-INDEX +8
-0@@ -142,6 +142,14 @@ bit-operations. The status bits that are defined are: * 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. +To set the WDOG_NO_WAY_OUT status bit (before registering your watchdog +timer device) you can either: +* set it statically in your watchdog_device struct with + .status = WATCHDOG_NOWAYOUT_INIT_STATUS, + (this will set the value the same as CONFIG_WATCHDOG_NOWAYOUT) or +* use the following helper function: +static inline void watchdog_set_nowayout(struct watchdog_device *wdd, int nowayout) +
I think one level of indentation would be helpful here so it visually belongs to the WDOG_NO_WAY_OUT paragraph?
Documentation/watchdog/00-INDEX bit-operations. The status bits that are defined are:
Quoted 7 lines
Documentation/watchdog/00-INDEX +7
-0+/* Use the following function to set the nowayout feature */ +static inline void watchdog_set_nowayout(struct watchdog_device *wdd, int nowayout) +{ + if (nowayout) + set_bit(WDOG_NO_WAY_OUT, &wdd->status); +} +
Other than that:
So, shall I fix the s3c-driver based on that or will you do?
Thanks,
Wolfram
Signature · 2 lines
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Hi Wolfram,
Quoted 4 lines
Quoted 4 lines
Documentation/watchdog/00-INDEX +0
-0
Quoted 8 lines
Documentation/watchdog/00-INDEX line 4
Quoted 5 lines
Documentation/watchdog/00-INDEX +2
-0@@ -1,5 +1,7 @@ 00-INDEX - this file. +convert_drivers_to_kernel_api.txt + - how-to for converting old watchdog drivers to the new kernel API.Since the howto needs a NOWAYOUT-update as well, I suggest I'll send a patch for that and take care of the missing index-entry there?
Ok.
Quoted 4 lines
Quoted 4 lines
Documentation/watchdog/00-INDEX +0
-0@@ -142,6 +142,14 @@ bit-operations. The status bits that are defined are: * 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.
Quoted 11 lines
Documentation/watchdog/00-INDEX bit-operations. The status bits that are defined are: · line 152
Quoted 8 lines
Documentation/watchdog/00-INDEX +8
-0+To set the WDOG_NO_WAY_OUT status bit (before registering your watchdog +timer device) you can either: +* set it statically in your watchdog_device struct with + .status = WATCHDOG_NOWAYOUT_INIT_STATUS, + (this will set the value the same as CONFIG_WATCHDOG_NOWAYOUT) or +* use the following helper function: +static inline void watchdog_set_nowayout(struct watchdog_device *wdd, int nowayout) +I think one level of indentation would be helpful here so it visually belongs to the
WDOG_NO_WAY_OUTparagraph?
Will fix that.
Quoted 10 lines
Documentation/watchdog/00-INDEX bit-operations. The status bits that are defined are:
Quoted 7 lines
Documentation/watchdog/00-INDEX +7
-0+/* Use the following function to set the nowayout feature */ +static inline void watchdog_set_nowayout(struct watchdog_device *wdd, int nowayout) +{ + if (nowayout) + set_bit(WDOG_NO_WAY_OUT, &wdd->status); +} +Other than that:
Quoted 3 lines
Reviewed-by Wolfram Sang <[email protected]>So, shall I fix the s3c-driver based on that or will you do?
Will included the fix in the final patch.
Kind regards,
Wim.
Hi Marc, Wolfram,
Quoted 3 lines
Add two nowayout helpers for the Watchdog Timer Driver Kernel API.
Signed-off-by Wim Van Sebroeck <[email protected]>
And this would give following patch for your drivers (see below).
Kind regards,
Wim.
---
drivers/watchdog/s3c2410_wdt.c +2 -0
@@ -378,6 +378,8 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev) "cannot start\n"); } +watchdog_set_nowayout (&s3c2410_wdd, nowayout); + ret =watchdog_register_device (&s3c2410_wdd);if (ret) {dev_err (dev,"cannot register watchdog (%d)\n" , ret);
drivers/watchdog/wm831x_wdt.c +1 -3
@@ -213,11 +213,9 @@ static int __devinit wm831x_wdt_probe(struct platform_device *pdev) wm831x_wdt->info = &wm831x_wdt_info; wm831x_wdt->ops = &wm831x_wdt_ops; +watchdog_set_nowayout (wm831x_wdt, nowayout);watchdog_set_drvdata (wm831x_wdt, driver_data); -if (nowayout) - wm831x_wdt->status |=WDOG_NO_WAY_OUT ; - reg =wm831x_reg_read (wm831x,WM831X_WATCHDOG ); reg &=WM831X_WDOG_TO_MASK ;for (i =0 ; i <ARRAY_SIZE (wm831x_wdt_cfgs); i++)
Mark Brown
Acked-byQuoted 1 line · Wim Van Sebroeck
Hi Marc, Wolfram,
Wim, please take more care with people's names. You routinely get my name wrong and you addressed Axel Lin as Alex earlier as well.
Quoted 1 line
And this would give following patch for your drivers (see below).
Hi Mark,
Quoted 2 lines
Wim, please take more care with people's names. You routinely get my name wrong and you addressed Axel Lin as Alex earlier as well.
You are right. Sorry about that.
Kind regards,
Wim.
Wolfram Sang
Reviewed-byQuoted 5 lines · Wim Van Sebroeck
Hi Marc, Wolfram,
Quoted 3 lines
Add two nowayout helpers for the Watchdog Timer Driver Kernel API.
Signed-off-by Wim Van Sebroeck <[email protected]>
Signature · 2 lines
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH v2 1/1 watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API
Hi All,
The patch like it is in the linux-next branch of the watchdog tree since a couple of minutes.
Kind regards,
Wim.
commit 3d17ee59111dd2311e5904294246d5b848342550
Author: Wim Van Sebroeck <[email protected]> Date: Tue Nov 29 16:24:16 2011 +0100
watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API
Add two nowayout helpers for the Watchdog Timer Driver Kernel API. And apply this to the already converted drivers.
Note: s3c2410_wdt lost the nowayout feature during the conversion.
Documentation/watchdog/watchdog-kernel-api.txt +9 -1
@@ -1,6 +1,6 @@ The Linux WatchDog Timer Driver Core kernel API. =============================================== -Last reviewed: 22-Jul-2011 +Last reviewed: 29-Nov-2011 Wim Van Sebroeck <[email protected]>
@@ -142,6 +142,14 @@ bit-operations. The status bits that are defined are: * 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. + To set the WDOG_NO_WAY_OUT status bit (before registering your watchdog + timer device) you can either: + * set it statically in your watchdog_device struct with + .status = WATCHDOG_NOWAYOUT_INIT_STATUS, + (this will set the value the same as CONFIG_WATCHDOG_NOWAYOUT) or + * use the following helper function: + static inline void watchdog_set_nowayout(struct watchdog_device *wdd, int nowayout) + 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.
drivers/watchdog/s3c2410_wdt.c +2 -0
@@ -378,6 +378,8 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev) "cannot start\n"); } +watchdog_set_nowayout (&s3c2410_wdd, nowayout); + ret =watchdog_register_device (&s3c2410_wdd);if (ret) {dev_err (dev,"cannot register watchdog (%d)\n" , ret);
drivers/watchdog/wm831x_wdt.c +1 -3
@@ -213,11 +213,9 @@ static int __devinit wm831x_wdt_probe(struct platform_device *pdev) wm831x_wdt->info = &wm831x_wdt_info; wm831x_wdt->ops = &wm831x_wdt_ops; +watchdog_set_nowayout (wm831x_wdt, nowayout);watchdog_set_drvdata (wm831x_wdt, driver_data); -if (nowayout) - wm831x_wdt->status |=WDOG_NO_WAY_OUT ; - reg =wm831x_reg_read (wm831x,WM831X_WATCHDOG ); reg &=WM831X_WDOG_TO_MASK ;for (i =0 ; i <ARRAY_SIZE (wm831x_wdt_cfgs); i++)
include/linux/watchdog.h +16 -5
@@ -53,11 +53,7 @@ struct watchdog_info {#ifdef __KERNEL__ -#ifdef CONFIG_WATCHDOG_NOWAYOUT -#define WATCHDOG_NOWAYOUT 1 -#else -#define WATCHDOG_NOWAYOUT 0 -#endif +#include <linux/bitops.h> struct watchdog_ops ;struct watchdog_device ;
@@ -122,6 +118,21 @@ struct watchdog_device {#define WDOG_NO_WAY_OUT 3/* Is 'nowayout' feature set ? */ }; +#ifdef CONFIG_WATCHDOG_NOWAYOUT +#define WATCHDOG_NOWAYOUT 1 +#define WATCHDOG_NOWAYOUT_INIT_STATUS (1 << WDOG_NO_WAY_OUT) +#else +#define WATCHDOG_NOWAYOUT 0 +#define WATCHDOG_NOWAYOUT_INIT_STATUS 0 +#endif + +/* Use the following function to set the nowayout feature */ +static inline void watchdog_set_nowayout (struct watchdog_device *wdd,int nowayout) +{ +if (nowayout) +set_bit (WDOG_NO_WAY_OUT , &wdd->status); +} +/* Use the following functions to manipulate watchdog driver specific data */ static inline void watchdog_set_drvdata (struct watchdog_device *wdd,void *data) {