Skip to contentSkip to conversation

Generic Watchdog Timer Driver

RFC PATCH Superseded Wim Van Sebroeck 2 participants 3 messages Feb 23, 2011 – Feb 25, 2011

Subsystems (2)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

RFC PATCH 3/10 Generic Watchdog Timer Driver

commit 87af8029a114af16d696047167d482624a1c9334

Author: Wim Van Sebroeck <[email protected]>
Date:   Fri Jun 18 09:03:14 2010 +0000

watchdog: WatchDog Timer Driver Core - Part 3

This part add's the WDIOC_KEEPALIVE ioctl functionality to the WatchDog Timer Driver Core framework. Please note that the WDIOF_KEEPALIVEPING bit has to be set in the watchdog_info options field.

Documentation/watchdog/src/watchdog-with-timer-example.c +1 -0
index ed7852a..d64cac6 100644
@@ -117,6 +117,7 @@ static int wdt_stop(struct watchdog_device *wdd)
  */
 static const struct watchdog_info wdt_info = {
 	.identity =	DRV_NAME,
+	.options =	WDIOF_KEEPALIVEPING,
 };
 
 static const struct watchdog_ops wdt_ops = {
Documentation/watchdog/watchdog-kernel-api.txt +3 -0
index 9418d4c..4a68e5e 100644
@@ -96,6 +96,9 @@ they are supported. These optional routines/operations are:
   the watchdog timer driver core does: to send a keepalive ping to the watchdog
   timer hardware it will either use the ping operation (when available) or the
   start operation (when the ping operation is not available).
+  (Note: the WDIOC_KEEPALIVE ioctl call will only be active when the
+  WDIOF_KEEPALIVEPING bit has been set in the option field on the watchdog's
+  info structure).
 * status: this routine checks the status of the watchdog timer device. The
   status of the device is reported with watchdog WDIOF_* status flags/bits.
 
drivers/watchdog/core/watchdog_dev.c +5 -0
index ad08a93..0d2ed1d 100644
@@ -151,6 +151,11 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
 		return put_user(val, p);
 	case WDIOC_GETBOOTSTATUS:
 		return put_user(wdd->bootstatus, p);
+	case WDIOC_KEEPALIVE:
+		if (!(wdd->info->options & WDIOF_MAGICCLOSE))
+			return -EOPNOTSUPP;
+		watchdog_ping(wdd);
+		return 0;
 	default:
 		return -ENOTTY;
 	}
include/linux/watchdog.h +3 -0
index 4d00bf8..a41dca3 100644
@@ -69,12 +69,15 @@ struct watchdog_ops {
 	int (*stop)(struct watchdog_device *);
 	/* optional operations */
 	int (*ping)(struct watchdog_device *);
+	int (*status)(struct watchdog_device *);
 };
 
 /* The structure that defines a watchdog device */
 struct watchdog_device {
 	char *name;
+	const struct watchdog_info *info;
 	const struct watchdog_ops *ops;
+	int bootstatus;
 	long status;
 #define WDOG_DEV_OPEN		1	/* is the watchdog opened via
 					 * /dev/watchdog */
#1 lore raw
Quoted 45 lines · Wim Van Sebroeck

commit 87af8029a114af16d696047167d482624a1c9334

Author: Wim Van Sebroeck<[email protected]>
Date:   Fri Jun 18 09:03:14 2010 +0000

watchdog: WatchDog Timer Driver Core - Part 3

This part add's the WDIOC_KEEPALIVE ioctl functionality to the WatchDog Timer Driver Core framework. Please note that the WDIOF_KEEPALIVEPING bit has to be set in the watchdog_info options field.

Documentation/watchdog/src/watchdog-with-timer-example.c +1 -0
index ed7852a..d64cac6 100644
@@ -117,6 +117,7 @@ static int wdt_stop(struct watchdog_device *wdd)
   */
  static const struct watchdog_info wdt_info = {
  	.identity =	DRV_NAME,
+	.options =	WDIOF_KEEPALIVEPING,
  };
 
  static const struct watchdog_ops wdt_ops = {
Documentation/watchdog/watchdog-kernel-api.txt +3 -0
index 9418d4c..4a68e5e 100644
@@ -96,6 +96,9 @@ they are supported. These optional routines/operations are:
    the watchdog timer driver core does: to send a keepalive ping to the watchdog
    timer hardware it will either use the ping operation (when available) or the
    start operation (when the ping operation is not available).
+  (Note: the WDIOC_KEEPALIVE ioctl call will only be active when the
+  WDIOF_KEEPALIVEPING bit has been set in the option field on the watchdog's
+  info structure).
  * status: this routine checks the status of the watchdog timer device. The
    status of the device is reported with watchdog WDIOF_* status flags/bits.
 
drivers/watchdog/core/watchdog_dev.c +0 -0
index ad08a93..0d2ed1d 100644

drivers/watchdog/core/watchdog_dev.c static long watchdog_ioctl(struct file *file, unsigned int cmd, · line 155

Quoted 5 lines
drivers/watchdog/core/watchdog_dev.c +2 -0
@@ -151,6 +151,11 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
  		return put_user(val, p);
  	case WDIOC_GETBOOTSTATUS:
  		return put_user(wdd->bootstatus, p);
+	case WDIOC_KEEPALIVE:
+		if (!(wdd->info->options&  WDIOF_MAGICCLOSE))

Is this meant to be WDIOF_KEEPALIVEPING ?

Quoted 26 lines
drivers/watchdog/core/watchdog_dev.c +3 -0
+			return -EOPNOTSUPP;
+		watchdog_ping(wdd);
+		return 0;
  	default:
  		return -ENOTTY;
  	}
include/linux/watchdog.h +3 -0
index 4d00bf8..a41dca3 100644
@@ -69,12 +69,15 @@ struct watchdog_ops {
  	int (*stop)(struct watchdog_device *);
  	/* optional operations */
  	int (*ping)(struct watchdog_device *);
+	int (*status)(struct watchdog_device *);
  };
 
  /* The structure that defines a watchdog device */
  struct watchdog_device {
  	char *name;
+	const struct watchdog_info *info;
  	const struct watchdog_ops *ops;
+	int bootstatus;
  	long status;
  #define WDOG_DEV_OPEN		1	/* is the watchdog opened via
  					 * /dev/watchdog */
#2 lore raw

Hi Mike,

Quoted 4 lines
Quoted 4 lines
drivers/watchdog/core/watchdog_dev.c +0 -0
index ad08a93..0d2ed1d 100644
Quoted 8 lines

drivers/watchdog/core/watchdog_dev.c static long watchdog_ioctl(struct file *file, unsigned int cmd, · line 155

Quoted 6 lines
drivers/watchdog/core/watchdog_dev.c +2 -0
@@ -151,6 +151,11 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
  		return put_user(val, p);
  	case WDIOC_GETBOOTSTATUS:
  		return put_user(wdd->bootstatus, p);
+	case WDIOC_KEEPALIVE:
+		if (!(wdd->info->options&  WDIOF_MAGICCLOSE))

Is this meant to be WDIOF_KEEPALIVEPING ?

Yes it is. Fixed this in my code.

Thanks,
Wim.