Here are four patches for the watchdog drivers. These patches
are an update to 2.4.20-pre1 of the original set against 2.4.19-pre9.
The first patch (this one) adds WDIOC_SETTIMEOUT support to
wafer5823wdt.c. The second patch adds Matt Domsch's 'nowayout' module
option to the drivers that currently don't have it. The third patch
fixes a bug where most of the "magic close character" capable drivers
don't use get_user(). The fourth patch adds "magic close character"
support to almost all of the remaining drivers. It also adds
WDIOF_MAGICCLOSE to the driver info flags.
Joel
diff -uNr linux-2.4.20-pre1/drivers/char/wafer5823wdt.c linux-2.4.20-pre1-settimeout/drivers/char/wafer5823wdt.c
--- linux-2.4.20-pre1/drivers/char/wafer5823wdt.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-settimeout/drivers/char/wafer5823wdt.c Wed Aug 7 15:24:03 2002
@@ -54,6 +54,7 @@
#define WDT_STOP 0x843
#define WD_TIMO 60 /* 1 minute */
+static int wd_margin = WD_TIMO;
static void wafwdt_ping(void)
{
@@ -67,7 +68,7 @@
static void wafwdt_start(void)
{
/* start up watchdog */
- outb_p(WD_TIMO, WDT_START);
+ outb_p(wd_margin, WDT_START);
inb_p(WDT_START);
}
@@ -94,8 +95,10 @@
static int wafwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
+ int new_margin;
static struct watchdog_info ident = {
- WDIOF_KEEPALIVEPING, 1, "Wafer 5823 WDT"
+ WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT,
+ 1, "Wafer 5823 WDT"
};
int one=1;
@@ -114,6 +117,18 @@
case WDIOC_KEEPALIVE:
wafwdt_ping();
break;
+
+ case WDIOC_SETTIMEOUT:
+ if (get_user(new_margin, (int *)arg))
+ return -EFAULT;
+ if ((new_margin < 1) || (new_margin > 255))
+ return -EINVAL;
+ wd_margin = new_margin;
+ wafwdt_stop();
+ wafwdt_start();
+ /* Fall */
+ case WDIOC_GETTIMEOUT:
+ return put_user(wd_margin, (int *)arg);
default:
return -ENOTTY;
--
"What do you take me for, an idiot?"
- General Charles de Gaulle, when a journalist asked him
if he was happy.
Joel Becker
Senior Member of Technical Staff
Oracle Corporation
E-mail: [email protected]
Phone: (650) 506-8127
The fourth patch, adding magicclose to the drivers that seem
able to support it.
Joel
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/acquirewdt.c linux-2.4.20-pre1-magicclose/drivers/char/acquirewdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/acquirewdt.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/acquirewdt.c Wed Aug 7 15:59:19 2002
@@ -45,6 +45,7 @@
static int acq_is_open;
static spinlock_t acq_lock;
+static int expect_close = 0;
/*
* You must set these - there is no sane way to probe for this board.
@@ -81,6 +82,21 @@
if(count)
{
+ if (!nowayout)
+ {
+ size_t i;
+
+ expect_close = 0;
+
+ for (i = 0; i != count; i++) {
+ char c;
+ if (get_user(c, buf + i))
+ return -EFAULT;
+ if (c == 'V')
+ expect_close = 1;
+ }
+ }
+
acq_ping();
return 1;
}
@@ -99,7 +115,7 @@
{
static struct watchdog_info ident=
{
- WDIOF_KEEPALIVEPING, 1, "Acquire WDT"
+ WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, 1, "Acquire WDT"
};
switch(cmd)
@@ -156,8 +172,13 @@
if(MINOR(inode->i_rdev)==WATCHDOG_MINOR)
{
spin_lock(&acq_lock);
- if (!nowayout) {
+ if (expect_close)
+ {
inb_p(WDT_STOP);
+ }
+ else
+ {
+ printk(KERN_CRIT "WDT closed unexpectedly. WDT will not stop!\n");
}
acq_is_open=0;
spin_unlock(&acq_lock);
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/advantechwdt.c linux-2.4.20-pre1-magicclose/drivers/char/advantechwdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/advantechwdt.c Wed Aug 7 15:40:06 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/advantechwdt.c Wed Aug 7 15:59:19 2002
@@ -143,7 +143,7 @@
{
int new_margin;
static struct watchdog_info ident = {
- options: WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT,
+ options: WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
firmware_version: 0,
identity: "Advantech WDT"
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/alim7101_wdt.c linux-2.4.20-pre1-magicclose/drivers/char/alim7101_wdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/alim7101_wdt.c Wed Aug 7 15:40:06 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/alim7101_wdt.c Wed Aug 7 15:59:19 2002
@@ -221,7 +221,7 @@
{
static struct watchdog_info ident=
{
- 0,
+ WDIOF_MAGICCLOSE,
1,
"ALiM7101"
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/eurotechwdt.c linux-2.4.20-pre1-magicclose/drivers/char/eurotechwdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/eurotechwdt.c Wed Aug 7 15:40:06 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/eurotechwdt.c Wed Aug 7 15:59:19 2002
@@ -265,7 +265,7 @@
unsigned int cmd, unsigned long arg)
{
static struct watchdog_info ident = {
- options : WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT,
+ options : WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
firmware_version : 0,
identity : "WDT Eurotech CPU-1220/1410"
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/i810-tco.c linux-2.4.20-pre1-magicclose/drivers/char/i810-tco.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/i810-tco.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/i810-tco.c Wed Aug 7 15:53:37 2002
@@ -241,7 +241,9 @@
int options, retval = -EINVAL;
static struct watchdog_info ident = {
- options: WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+ options: WDIOF_SETTIMEOUT |
+ WDIOF_KEEPALIVEPING |
+ WDIOF_MAGICCLOSE,
firmware_version: 0,
identity: "i810 TCO timer",
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/ib700wdt.c linux-2.4.20-pre1-magicclose/drivers/char/ib700wdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/ib700wdt.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/ib700wdt.c Wed Aug 7 15:59:19 2002
@@ -50,6 +50,7 @@
static int ibwdt_is_open;
static spinlock_t ibwdt_lock;
+static int expect_close = 0;
/*
*
@@ -143,6 +144,20 @@
return -ESPIPE;
if (count) {
+ if (!nowayout) {
+ size_t i;
+
+ /* In case it was set long ago */
+ expect_close = 0;
+
+ for (i = 0; i != count; i++) {
+ char c;
+ if (get_user(c, buf + i))
+ return -EFAULT;
+ if (c == 'V')
+ expect_close = 1;
+ }
+ }
ibwdt_ping();
return 1;
}
@@ -162,7 +177,10 @@
int i, new_margin;
static struct watchdog_info ident = {
- WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT, 1, "IB700 WDT"
+ WDIOF_KEEPALIVEPING |
+ WDIOF_SETTIMEOUT |
+ WDIOF_MAGICCLOSE,
+ 1, "IB700 WDT"
};
switch (cmd) {
@@ -231,8 +249,10 @@
lock_kernel();
if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) {
spin_lock(&ibwdt_lock);
- if (!nowayout) {
+ if (expect_close) {
outb_p(wd_times[wd_margin], WDT_STOP);
+ } else {
+ printk(KERN_CRIT "WDT device closed unexpectedly. WDT will not stop!\n");
}
ibwdt_is_open = 0;
spin_unlock(&ibwdt_lock);
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/indydog.c linux-2.4.20-pre1-magicclose/drivers/char/indydog.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/indydog.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/indydog.c Wed Aug 7 15:59:19 2002
@@ -26,6 +26,7 @@
static unsigned long indydog_alive;
static struct sgimc_misc_ctrl *mcmisc_regs;
+static int expect_close = 0;
#ifdef CONFIG_WATCHDOG_NOWAYOUT
static int nowayout = 1;
@@ -74,13 +75,17 @@
* Shut off the timer.
* Lock it in if it's a module and we set nowayout.
*/
- if (!nowayout)
+ if (expect_close)
{
u32 mc_ctrl0 = mcmisc_regs->cpuctrl0;
mc_ctrl0 &= ~SGIMC_CCTRL0_WDOG;
mcmisc_regs->cpuctrl0 = mc_ctrl0;
printk("Stopped watchdog timer.\n");
}
+ else
+ {
+ printk(KERN_CRIT "WDT device closed unexpectedly. WDT will not stop!\n");
+ }
clear_bit(0,&indydog_alive);
return 0;
}
@@ -95,6 +100,20 @@
* Refresh the timer.
*/
if(len) {
+ if (!nowayout) {
+ size_t i;
+
+ /* In case it was set long ago */
+ expect_close = 0;
+
+ for (i = 0; i != len; i++) {
+ char c;
+ if (get_user(c, data + i))
+ return -EFAULT;
+ if (c == 'V')
+ expect_close = 1;
+ }
+ }
indydog_ping();
return 1;
}
@@ -105,6 +124,7 @@
unsigned int cmd, unsigned long arg)
{
static struct watchdog_info ident = {
+ options: WDIOF_MAGICCLOSE,
identity: "Hardware Watchdog for SGI IP22",
};
switch (cmd) {
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/machzwd.c linux-2.4.20-pre1-magicclose/drivers/char/machzwd.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/machzwd.c Wed Aug 7 15:40:06 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/machzwd.c Wed Aug 7 15:59:19 2002
@@ -117,7 +117,7 @@
#define PFX "machzwd"
static struct watchdog_info zf_info = {
- options: WDIOF_KEEPALIVEPING,
+ options: WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
firmware_version: 1,
identity: "ZF-Logic watchdog"
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/mixcomwd.c linux-2.4.20-pre1-magicclose/drivers/char/mixcomwd.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/mixcomwd.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/mixcomwd.c Wed Aug 7 15:59:19 2002
@@ -63,6 +63,7 @@
static int mixcomwd_timer_alive;
static struct timer_list mixcomwd_timer;
+static int expect_close = 0;
#ifdef CONFIG_WATCHDOG_NOWAYOUT
static int nowayout = 1;
@@ -111,7 +112,7 @@
{
lock_kernel();
- if (!nowayout) {
+ if (expect_close) {
if(mixcomwd_timer_alive) {
printk(KERN_ERR "mixcomwd: release called while internal timer alive");
unlock_kernel();
@@ -123,6 +124,8 @@
mixcomwd_timer.data=0;
mixcomwd_timer_alive=1;
add_timer(&mixcomwd_timer);
+ } else {
+ printk(KERN_CRIT "mixcomwd: WDT device closed unexpectedly. WDT will not stop!\n");
}
clear_bit(0,&mixcomwd_opened);
@@ -139,6 +142,20 @@
if(len)
{
+ if (!nowayout) {
+ size_t i;
+
+ /* In case it was set long ago */
+ expect_close = 0;
+
+ for (i = 0; i != len; i++) {
+ char c;
+ if (get_user(c, data + i))
+ return -EFAULT;
+ if (c == 'V')
+ expect_close = 1;
+ }
+ }
mixcomwd_ping();
return 1;
}
@@ -150,7 +167,8 @@
{
int status;
static struct watchdog_info ident = {
- WDIOF_KEEPALIVEPING, 1, "MixCOM watchdog"
+ WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
+ 1, "MixCOM watchdog"
};
switch(cmd)
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/pcwd.c linux-2.4.20-pre1-magicclose/drivers/char/pcwd.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/pcwd.c Wed Aug 7 15:35:44 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/pcwd.c Wed Aug 7 15:58:40 2002
@@ -88,6 +88,7 @@
static int timeout_val;
static int timeout = 2;
+static int expect_close = 0;
MODULE_PARM (timeout, "i");
MODULE_PARM_DESC (timeout, "Watchdog timeout in seconds (default=2)");
@@ -213,7 +214,7 @@
spin_unlock (&io_lock);
/* Transform the card register to the ioctl bits we use internally */
- retval = 0;
+ retval = WDIOF_MAGICCLOSE;
if (status & WD_WDRST)
retval |= WDIOF_CARDRESET;
if (status & WD_T110)
@@ -385,6 +386,20 @@
return -ESPIPE;
if (len) {
+ if (!nowayout) {
+ size_t i;
+
+ /* In case it was set long ago */
+ expect_close = 0;
+
+ for (i = 0; i != len; i++) {
+ char c;
+ if (get_user(c, buf + i))
+ return -EFAULT;
+ if (c == 'V')
+ expect_close = 1;
+ }
+ }
pcwd_info.card_info->wd_tickle ();
return 1;
}
@@ -450,7 +465,7 @@
{
switch (MINOR (ino->i_rdev)) {
case WATCHDOG_MINOR:
- if (!nowayout)
+ if (expect_close)
pcwd_info.card_info->enable_card (0);
atomic_inc (&pcwd_info.open_allowed);
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/sbc60xxwdt.c linux-2.4.20-pre1-magicclose/drivers/char/sbc60xxwdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/sbc60xxwdt.c Thu Sep 13 15:21:32 2001
+++ linux-2.4.20-pre1-magicclose/drivers/char/sbc60xxwdt.c Wed Aug 7 15:59:19 2002
@@ -234,7 +234,7 @@
{
static struct watchdog_info ident=
{
- 0,
+ WDIOF_MAGICCLOSE,
1,
"SB60xx"
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/sc1200wdt.c linux-2.4.20-pre1-magicclose/drivers/char/sc1200wdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/sc1200wdt.c Wed Aug 7 15:40:06 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/sc1200wdt.c Wed Aug 7 15:59:19 2002
@@ -171,7 +171,7 @@
{
int new_timeout;
static struct watchdog_info ident = {
- options: WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT,
+ options: WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
firmware_version: 0,
identity: "PC87307/PC97307"
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/sc520_wdt.c linux-2.4.20-pre1-magicclose/drivers/char/sc520_wdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/sc520_wdt.c Wed Aug 7 15:40:06 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/sc520_wdt.c Wed Aug 7 15:59:19 2002
@@ -269,7 +269,7 @@
{
static struct watchdog_info ident=
{
- 0,
+ WDIOF_MAGICCLOSE,
1,
"SC520"
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/shwdt.c linux-2.4.20-pre1-magicclose/drivers/char/shwdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/shwdt.c Wed Aug 7 15:40:06 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/shwdt.c Wed Aug 7 15:59:19 2002
@@ -347,7 +347,7 @@
};
static struct watchdog_info sh_wdt_info = {
- options: WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT,
+ options: WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
firmware_version: 0,
identity: "SH WDT",
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/softdog.c linux-2.4.20-pre1-magicclose/drivers/char/softdog.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/softdog.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/softdog.c Wed Aug 7 15:59:19 2002
@@ -51,6 +51,7 @@
#define TIMER_MARGIN 60 /* (secs) Default is 1 minute */
+static int expect_close = 0;
static int soft_margin = TIMER_MARGIN; /* in seconds */
#ifdef ONLY_TESTING
static int soft_noboot = 1;
@@ -123,8 +124,10 @@
* Shut off the timer.
* Lock it in if it's a module and we set nowayout
*/
- if (!nowayout) {
+ if (expect_close) {
del_timer(&watchdog_ticktock);
+ } else {
+ printk(KERN_CRIT "SOFTDOG: WDT device closed unexpectedly. WDT will not stop!\n");
}
clear_bit(0, &timer_alive);
return 0;
@@ -140,6 +143,20 @@
* Refresh the timer.
*/
if(len) {
+ if (!nowayout) {
+ size_t i;
+
+ /* In case it was set long ago */
+ expect_close = 0;
+
+ for (i = 0; i != len; i++) {
+ char c;
+ if (get_user(c, data + i))
+ return -EFAULT;
+ if (c == 'V')
+ expect_close = 1;
+ }
+ }
mod_timer(&watchdog_ticktock, jiffies+(soft_margin*HZ));
return 1;
}
@@ -151,7 +168,7 @@
{
int new_margin;
static struct watchdog_info ident = {
- WDIOF_SETTIMEOUT,
+ WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
0,
"Software Watchdog"
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/w83877f_wdt.c linux-2.4.20-pre1-magicclose/drivers/char/w83877f_wdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/w83877f_wdt.c Wed Aug 7 15:40:06 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/w83877f_wdt.c Wed Aug 7 15:59:19 2002
@@ -251,7 +251,7 @@
{
static struct watchdog_info ident=
{
- 0,
+ WDIOF_MAGICCLOSE,
1,
"W83877F"
};
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/wafer5823wdt.c linux-2.4.20-pre1-magicclose/drivers/char/wafer5823wdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/wafer5823wdt.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/wafer5823wdt.c Wed Aug 7 15:59:19 2002
@@ -40,6 +40,7 @@
static unsigned long wafwdt_is_open;
static spinlock_t wafwdt_lock;
+static int expect_close = 0;
/*
* You must set these - there is no sane way to probe for this board.
@@ -95,6 +96,20 @@
return -ESPIPE;
if (count) {
+ if (!nowayout) {
+ size_t i;
+
+ /* In case it was set long ago */
+ expect_close = 0;
+
+ for (i = 0; i != count; i++) {
+ char c;
+ if (get_user(c, buf + i))
+ return -EFAULT;
+ if (c == 'V')
+ expect_close = 1;
+ }
+ }
wafwdt_ping();
return 1;
}
@@ -106,7 +121,9 @@
{
int new_margin;
static struct watchdog_info ident = {
- WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT,
+ WDIOF_KEEPALIVEPING |
+ WDIOF_SETTIMEOUT |
+ WDIOF_MAGICCLOSE,
1, "Wafer 5823 WDT"
};
int one=1;
@@ -157,8 +174,10 @@
wafwdt_close(struct inode *inode, struct file *file)
{
clear_bit(0, &wafwdt_is_open);
- if (!nowayout) {
+ if (expect_close) {
wafwdt_stop();
+ } else {
+ printk(KERN_CRIT "WDT device closed unexpectedly. WDT will not stop!\n");
}
return 0;
}
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/wdt.c linux-2.4.20-pre1-magicclose/drivers/char/wdt.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/wdt.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/wdt.c Wed Aug 7 15:59:19 2002
@@ -53,6 +53,7 @@
#include <linux/init.h>
static unsigned long wdt_is_open;
+static int expect_close;
/*
* You must set these - there is no sane way to probe for this board.
@@ -253,6 +254,20 @@
if(count)
{
+ if (!nowayout) {
+ size_t i;
+
+ /* In case it was set long ago */
+ expect_close = 0;
+
+ for (i = 0; i != count; i++) {
+ char c;
+ if (get_user(c, buf + i))
+ return -EFAULT;
+ if (c == 'V')
+ expect_close = 1;
+ }
+ }
wdt_ping();
return 1;
}
@@ -314,7 +329,7 @@
{
WDIOF_OVERHEAT|WDIOF_POWERUNDER|WDIOF_POWEROVER
|WDIOF_EXTERN1|WDIOF_EXTERN2|WDIOF_FANFAULT
- |WDIOF_SETTIMEOUT,
+ |WDIOF_SETTIMEOUT|WDIOF_MAGICCLOSE,
1,
"WDT500/501"
};
@@ -404,9 +419,11 @@
{
if(MINOR(inode->i_rdev)==WATCHDOG_MINOR)
{
- if (!nowayout) {
+ if (expect_close) {
inb_p(WDT_DC); /* Disable counters */
wdt_ctr_load(2,0); /* 0 length reset pulses now */
+ } else {
+ printk(KERN_CRIT "wdt: WDT device closed unexpectedly. WDT will not stop!\n");
}
clear_bit(0, &wdt_is_open);
}
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/wdt977.c linux-2.4.20-pre1-magicclose/drivers/char/wdt977.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/wdt977.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/wdt977.c Wed Aug 7 15:59:19 2002
@@ -33,6 +33,7 @@
static int timeout = 3;
static int timer_alive;
static int testmode;
+static int expect_close = 0;
#ifdef CONFIG_WATCHDOG_NOWAYOUT
static int nowayout = 1;
@@ -103,48 +104,64 @@
* Shut off the timer.
* Lock it in if it's a module and we set nowayout
*/
- if (!nowayout) { /* FIXME: not fixing indentation */
lock_kernel();
+ if (expect_close) {
- // unlock the SuperIO chip
- outb(0x87,0x370);
- outb(0x87,0x370);
-
- //select device Aux2 (device=8) and set watchdog regs F2,F3 and F4
- //F3 is reset to its default state
- //F4 can clear the TIMEOUT'ed state (bit 0) - back to default
- //We can not use GP17 as a PowerLed, as we use its usage as a RedLed
+ // unlock the SuperIO chip
+ outb(0x87,0x370);
+ outb(0x87,0x370);
+
+ //select device Aux2 (device=8) and set watchdog regs F2,F3 and F4
+ //F3 is reset to its default state
+ //F4 can clear the TIMEOUT'ed state (bit 0) - back to default
+ //We can not use GP17 as a PowerLed, as we use its usage as a RedLed
- outb(0x07,0x370);
- outb(0x08,0x371);
- outb(0xF2,0x370);
- outb(0xFF,0x371);
- outb(0xF3,0x370);
- outb(0x00,0x371);
- outb(0xF4,0x370);
- outb(0x00,0x371);
- outb(0xF2,0x370);
- outb(0x00,0x371);
+ outb(0x07,0x370);
+ outb(0x08,0x371);
+ outb(0xF2,0x370);
+ outb(0xFF,0x371);
+ outb(0xF3,0x370);
+ outb(0x00,0x371);
+ outb(0xF4,0x370);
+ outb(0x00,0x371);
+ outb(0xF2,0x370);
+ outb(0x00,0x371);
- //at last select device Aux1 (dev=7) and set GP16 as a watchdog output
- outb(0x07,0x370);
- outb(0x07,0x371);
- outb(0xE6,0x370);
- outb(0x08,0x371);
+ //at last select device Aux1 (dev=7) and set GP16 as a watchdog output
+ outb(0x07,0x370);
+ outb(0x07,0x371);
+ outb(0xE6,0x370);
+ outb(0x08,0x371);
- // lock the SuperIO chip
- outb(0xAA,0x370);
+ // lock the SuperIO chip
+ outb(0xAA,0x370);
+ printk(KERN_INFO "Watchdog: shutdown.\n");
+ } else {
+ printk(KERN_CRIT "WDT device closed unexpectedly. WDT will not stop!\n");
+ }
timer_alive=0;
unlock_kernel();
- printk(KERN_INFO "Watchdog: shutdown.\n");
- }
return 0;
}
static ssize_t wdt977_write(struct file *file, const char *data, size_t len, loff_t *ppos)
{
+ if (!nowayout) {
+ size_t i;
+
+ /* In case it was set long ago */
+ expect_close = 0;
+
+ for (i = 0; i != len; i++) {
+ char c;
+ if (get_user(c, data + i))
+ return -EFAULT;
+ if (c == 'V')
+ expect_close = 1;
+ }
+ }
//max timeout value = 255 minutes (0xFF). Write 0 to disable WatchDog.
if (timeout>255)
diff -uNr linux-2.4.20-pre1-magicclose-fix/drivers/char/wdt_pci.c linux-2.4.20-pre1-magicclose/drivers/char/wdt_pci.c
--- linux-2.4.20-pre1-magicclose-fix/drivers/char/wdt_pci.c Wed Aug 7 15:40:06 2002
+++ linux-2.4.20-pre1-magicclose/drivers/char/wdt_pci.c Wed Aug 7 15:59:19 2002
@@ -314,7 +314,7 @@
{
WDIOF_OVERHEAT|WDIOF_POWERUNDER|WDIOF_POWEROVER
|WDIOF_EXTERN1|WDIOF_EXTERN2|WDIOF_FANFAULT
- |WDIOF_SETTIMEOUT,
+ |WDIOF_SETTIMEOUT|WDIOF_MAGICCLOSE,
1,
"WDT500/501PCI"
};
--
"You don't make the poor richer by making the rich poorer."
- Sir Winston Churchill
Joel Becker
Senior Member of Technical Staff
Oracle Corporation
E-mail: [email protected]
Phone: (650) 506-8127
The second part of the patch, adding Matt Domsch's nowayout code
to various watchdog drivers.
Joel
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/acquirewdt.c linux-2.4.20-pre1-nowayout/drivers/char/acquirewdt.c
--- linux-2.4.20-pre1-settimeout/drivers/char/acquirewdt.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/acquirewdt.c Wed Aug 7 15:30:18 2002
@@ -17,6 +17,9 @@
*
* (c) Copyright 1995 Alan Cox <[email protected]>
*
+ * 14-Dec-2001 Matt Domsch <[email protected]>
+ * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
+ * Can't add timeout - driver doesn't allow changing value
*/
#include <linux/config.h>
@@ -50,8 +53,14 @@
#define WDT_STOP 0x43
#define WDT_START 0x443
-#define WD_TIMO (100*60) /* 1 minute */
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
/*
* Kernel methods.
@@ -126,10 +135,12 @@
spin_unlock(&acq_lock);
return -EBUSY;
}
+ if (nowayout) {
+ MOD_INC_USE_COUNT;
+ }
/*
* Activate
*/
-
acq_is_open=1;
inb_p(WDT_START);
spin_unlock(&acq_lock);
@@ -145,9 +156,9 @@
if(MINOR(inode->i_rdev)==WATCHDOG_MINOR)
{
spin_lock(&acq_lock);
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- inb_p(WDT_STOP);
-#endif
+ if (!nowayout) {
+ inb_p(WDT_STOP);
+ }
acq_is_open=0;
spin_unlock(&acq_lock);
}
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/advantechwdt.c linux-2.4.20-pre1-nowayout/drivers/char/advantechwdt.c
--- linux-2.4.20-pre1-settimeout/drivers/char/advantechwdt.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/advantechwdt.c Wed Aug 7 15:30:18 2002
@@ -20,6 +20,8 @@
*
* (c) Copyright 1995 Alan Cox <[email protected]>
*
+ * 14-Dec-2001 Matt Domsch <[email protected]>
+ * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
*/
#include <linux/config.h>
@@ -57,6 +59,15 @@
static int wd_margin = 60; /* 60 sec default timeout */
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
/*
* Kernel methods.
*/
@@ -108,16 +119,16 @@
return -ESPIPE;
if (count) {
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- size_t i;
+ if (!nowayout) {
+ size_t i;
- adv_expect_close = 0;
+ adv_expect_close = 0;
- for (i = 0; i != count; i++) {
- if (buf[i] == 'V')
- adv_expect_close = 42;
+ for (i = 0; i != count; i++) {
+ if (buf[i] == 'V')
+ adv_expect_close = 42;
+ }
}
-#endif
advwdt_ping();
}
return count;
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/alim7101_wdt.c linux-2.4.20-pre1-nowayout/drivers/char/alim7101_wdt.c
--- linux-2.4.20-pre1-settimeout/drivers/char/alim7101_wdt.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/alim7101_wdt.c Wed Aug 7 15:30:18 2002
@@ -79,6 +79,15 @@
static int wdt_expect_close;
static struct pci_dev *alim7101_pmu;
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
/*
* Whack the dog
*/
@@ -157,16 +166,18 @@
/* See if we got the magic character */
if(count)
{
- size_t ofs;
+ if (!nowayout) {
+ size_t ofs;
- /* note: just in case someone wrote the magic character
- * five months ago... */
- wdt_expect_close = 0;
-
- /* now scan */
- for(ofs = 0; ofs != count; ofs++)
- if(buf[ofs] == 'V')
- wdt_expect_close = 1;
+ /* note: just in case someone wrote the magic
+ * character five months ago... */
+ wdt_expect_close = 0;
+
+ /* now scan */
+ for(ofs = 0; ofs != count; ofs++)
+ if(buf[ofs] == 'V')
+ wdt_expect_close = 1;
+ }
/* someone wrote to us, we should restart timer */
next_heartbeat = jiffies + WDT_HEARTBEAT;
@@ -193,15 +204,11 @@
static int fop_close(struct inode * inode, struct file * file)
{
-#ifdef CONFIG_WDT_NOWAYOUT
if(wdt_expect_close)
wdt_turnoff();
else {
printk(OUR_NAME ": device file closed unexpectedly. Will not stop the WDT!\n");
}
-#else
- wdt_turnoff();
-#endif
clear_bit(0, &wdt_is_open);
return 0;
}
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/eurotechwdt.c linux-2.4.20-pre1-nowayout/drivers/char/eurotechwdt.c
--- linux-2.4.20-pre1-settimeout/drivers/char/eurotechwdt.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/eurotechwdt.c Wed Aug 7 15:30:18 2002
@@ -35,6 +35,9 @@
*
* 2001 - Rodolfo Giometti
* Initial release
+ *
+ * 2002.05.30 - Joel Becker <[email protected]>
+ * Added Matt Domsch's nowayout module option.
*/
#include <linux/config.h>
@@ -68,6 +71,14 @@
#define WDT_TIMEOUT 60 /* 1 minute */
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
/*
* Some symbolic names
@@ -220,16 +231,16 @@
return -ESPIPE;
if (count) {
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- size_t i;
+ if (!nowayout) {
+ size_t i;
- eur_expect_close = 0;
+ eur_expect_close = 0;
- for (i = 0; i != count; i++) {
- if (buf[i] == 'V')
- eur_expect_close = 42;
+ for (i = 0; i != count; i++) {
+ if (buf[i] == 'V')
+ eur_expect_close = 42;
+ }
}
-#endif
eurwdt_ping(); /* the default timeout */
}
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/ib700wdt.c linux-2.4.20-pre1-nowayout/drivers/char/ib700wdt.c
--- linux-2.4.20-pre1-settimeout/drivers/char/ib700wdt.c Mon Feb 25 11:37:57 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/ib700wdt.c Wed Aug 7 15:30:18 2002
@@ -114,6 +114,15 @@
static int wd_margin = WD_TIMO;
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
/*
* Kernel methods.
@@ -222,9 +231,9 @@
lock_kernel();
if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) {
spin_lock(&ibwdt_lock);
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- outb_p(wd_times[wd_margin], WDT_STOP);
-#endif
+ if (!nowayout) {
+ outb_p(wd_times[wd_margin], WDT_STOP);
+ }
ibwdt_is_open = 0;
spin_unlock(&ibwdt_lock);
}
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/indydog.c linux-2.4.20-pre1-nowayout/drivers/char/indydog.c
--- linux-2.4.20-pre1-settimeout/drivers/char/indydog.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/indydog.c Wed Aug 7 15:30:18 2002
@@ -27,6 +27,15 @@
static unsigned long indydog_alive;
static struct sgimc_misc_ctrl *mcmisc_regs;
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
static void indydog_ping()
{
mcmisc_regs->watchdogt = 0;
@@ -43,9 +52,9 @@
if( test_and_set_bit(0,&indydog_alive) )
return -EBUSY;
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
- MOD_INC_USE_COUNT;
-#endif
+ if (nowayout) {
+ MOD_INC_USE_COUNT;
+ }
/*
* Activate timer
*/
@@ -63,16 +72,15 @@
{
/*
* Shut off the timer.
- * Lock it in if it's a module and we defined ...NOWAYOUT
+ * Lock it in if it's a module and we set nowayout.
*/
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
+ if (!nowayout)
{
- u32 mc_ctrl0 = mcmisc_regs->cpuctrl0;
- mc_ctrl0 &= ~SGIMC_CCTRL0_WDOG;
- mcmisc_regs->cpuctrl0 = mc_ctrl0;
- printk("Stopped watchdog timer.\n");
+ u32 mc_ctrl0 = mcmisc_regs->cpuctrl0;
+ mc_ctrl0 &= ~SGIMC_CCTRL0_WDOG;
+ mcmisc_regs->cpuctrl0 = mc_ctrl0;
+ printk("Stopped watchdog timer.\n");
}
-#endif
clear_bit(0,&indydog_alive);
return 0;
}
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/machzwd.c linux-2.4.20-pre1-nowayout/drivers/char/machzwd.c
--- linux-2.4.20-pre1-settimeout/drivers/char/machzwd.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/machzwd.c Wed Aug 7 15:30:18 2002
@@ -24,6 +24,8 @@
* a system RESET and it starts wd#2 that unconditionaly will RESET
* the system when the counter reaches zero.
*
+ * 14-Dec-2001 Matt Domsch <[email protected]>
+ * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
*/
#include <linux/config.h>
@@ -103,6 +105,15 @@
MODULE_PARM(action, "i");
MODULE_PARM_DESC(action, "after watchdog resets, generate: 0 = RESET(*) 1 = SMI 2 = NMI 3 = SCI");
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
#define PFX "machzwd"
static struct watchdog_info zf_info = {
@@ -303,27 +314,27 @@
/* See if we got the magic character */
if(count){
-/*
- * no need to check for close confirmation
- * no way to disable watchdog ;)
- */
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- size_t ofs;
-
- /*
- * note: just in case someone wrote the magic character
- * five months ago...
+ /*
+ * no need to check for close confirmation
+ * no way to disable watchdog ;)
*/
- zf_expect_close = 0;
+ if (!nowayout) {
+ size_t ofs;
- /* now scan */
- for(ofs = 0; ofs != count; ofs++){
- if(buf[ofs] == 'V'){
- zf_expect_close = 1;
- dprintk("zf_expect_close 1\n");
+ /*
+ * note: just in case someone wrote the magic
+ * character five months ago...
+ */
+ zf_expect_close = 0;
+
+ /* now scan */
+ for(ofs = 0; ofs != count; ofs++){
+ if(buf[ofs] == 'V'){
+ zf_expect_close = 1;
+ dprintk("zf_expect_close 1\n");
+ }
}
}
-#endif
/*
* Well, anyhow someone wrote to us,
* we should return that favour
@@ -381,9 +392,9 @@
return -EBUSY;
}
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
- MOD_INC_USE_COUNT;
-#endif
+ if (nowayout) {
+ MOD_INC_USE_COUNT;
+ }
zf_is_open = 1;
spin_unlock(&zf_lock);
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/mixcomwd.c linux-2.4.20-pre1-nowayout/drivers/char/mixcomwd.c
--- linux-2.4.20-pre1-settimeout/drivers/char/mixcomwd.c Thu Sep 13 15:21:32 2001
+++ linux-2.4.20-pre1-nowayout/drivers/char/mixcomwd.c Wed Aug 7 15:30:18 2002
@@ -27,10 +27,13 @@
*
* Version 0.4 (99/11/15):
* - support for one more type board
+ *
+ * Version 0.5 (2001/12/14) Matt Domsch <[email protected]>
+ * - added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
*
*/
-#define VERSION "0.4"
+#define VERSION "0.5"
#include <linux/module.h>
#include <linux/config.h>
@@ -58,25 +61,30 @@
static int watchdog_port;
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
static int mixcomwd_timer_alive;
static struct timer_list mixcomwd_timer;
+
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
#endif
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
static void mixcomwd_ping(void)
{
outb_p(55,watchdog_port);
return;
}
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
static void mixcomwd_timerfun(unsigned long d)
{
mixcomwd_ping();
mod_timer(&mixcomwd_timer,jiffies+ 5*HZ);
}
-#endif
/*
* Allow only one person to hold it open
@@ -89,12 +97,13 @@
}
mixcomwd_ping();
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
+ if (nowayout) {
+ MOD_INC_USE_COUNT;
+ }
if(mixcomwd_timer_alive) {
del_timer(&mixcomwd_timer);
mixcomwd_timer_alive=0;
}
-#endif
return 0;
}
@@ -102,19 +111,19 @@
{
lock_kernel();
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- if(mixcomwd_timer_alive) {
- printk(KERN_ERR "mixcomwd: release called while internal timer alive");
- unlock_kernel();
- return -EBUSY;
+ if (!nowayout) {
+ if(mixcomwd_timer_alive) {
+ printk(KERN_ERR "mixcomwd: release called while internal timer alive");
+ unlock_kernel();
+ return -EBUSY;
+ }
+ init_timer(&mixcomwd_timer);
+ mixcomwd_timer.expires=jiffies + 5 * HZ;
+ mixcomwd_timer.function=mixcomwd_timerfun;
+ mixcomwd_timer.data=0;
+ mixcomwd_timer_alive=1;
+ add_timer(&mixcomwd_timer);
}
- init_timer(&mixcomwd_timer);
- mixcomwd_timer.expires=jiffies + 5 * HZ;
- mixcomwd_timer.function=mixcomwd_timerfun;
- mixcomwd_timer.data=0;
- mixcomwd_timer_alive=1;
- add_timer(&mixcomwd_timer);
-#endif
clear_bit(0,&mixcomwd_opened);
unlock_kernel();
@@ -148,9 +157,9 @@
{
case WDIOC_GETSTATUS:
status=mixcomwd_opened;
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- status|=mixcomwd_timer_alive;
-#endif
+ if (!nowayout) {
+ status|=mixcomwd_timer_alive;
+ }
if (copy_to_user((int *)arg, &status, sizeof(int))) {
return -EFAULT;
}
@@ -255,14 +264,14 @@
static void __exit mixcomwd_exit(void)
{
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- if(mixcomwd_timer_alive) {
- printk(KERN_WARNING "mixcomwd: I quit now, hardware will"
- " probably reboot!\n");
- del_timer(&mixcomwd_timer);
- mixcomwd_timer_alive=0;
+ if (!nowayout) {
+ if(mixcomwd_timer_alive) {
+ printk(KERN_WARNING "mixcomwd: I quit now, hardware will"
+ " probably reboot!\n");
+ del_timer(&mixcomwd_timer);
+ mixcomwd_timer_alive=0;
+ }
}
-#endif
release_region(watchdog_port,1);
misc_deregister(&mixcomwd_miscdev);
}
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/sc1200wdt.c linux-2.4.20-pre1-nowayout/drivers/char/sc1200wdt.c
--- linux-2.4.20-pre1-settimeout/drivers/char/sc1200wdt.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/sc1200wdt.c Wed Aug 7 15:30:18 2002
@@ -22,6 +22,8 @@
* <[email protected]> Return proper status instead of temperature warning
* Add WDIOC_GETBOOTSTATUS and WDIOC_SETOPTIONS ioctls
* Fix CONFIG_WATCHDOG_NOWAYOUT
+ * 20020530 Joel Becker Add Matt Domsch's nowayout
+ * module option
*/
#include <linux/config.h>
@@ -86,6 +88,14 @@
MODULE_PARM(timeout, "i");
MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1");
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
/* Read from Data Register */
@@ -246,17 +256,17 @@
return -ESPIPE;
if (len) {
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- size_t i;
+ if (!nowayout) {
+ size_t i;
- expect_close = 0;
+ expect_close = 0;
- for (i = 0; i != len; i++)
- {
- if (data[i] == 'V')
- expect_close = 42;
+ for (i = 0; i != len; i++)
+ {
+ if (data[i] == 'V')
+ expect_close = 42;
+ }
}
-#endif
sc1200wdt_write_data(WDTO, timeout);
return len;
}
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/sc520_wdt.c linux-2.4.20-pre1-nowayout/drivers/char/sc520_wdt.c
--- linux-2.4.20-pre1-settimeout/drivers/char/sc520_wdt.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/sc520_wdt.c Wed Aug 7 15:30:18 2002
@@ -110,6 +110,15 @@
static unsigned long wdt_is_open;
static int wdt_expect_close;
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
static spinlock_t wdt_spinlock;
/*
* Whack the dog
@@ -172,12 +181,12 @@
static void wdt_turnoff(void)
{
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- /* Stop the timer */
- del_timer(&timer);
- wdt_config(0);
- printk(OUR_NAME ": Watchdog timer is now disabled...\n");
-#endif
+ if (!nowayout) {
+ /* Stop the timer */
+ del_timer(&timer);
+ wdt_config(0);
+ printk(OUR_NAME ": Watchdog timer is now disabled...\n");
+ }
}
@@ -222,9 +231,9 @@
return -EBUSY;
/* Good, fire up the show */
wdt_startup();
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
- MOD_INC_USE_COUNT;
-#endif
+ if (nowayout) {
+ MOD_INC_USE_COUNT;
+ }
return 0;
default:
return -ENODEV;
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/softdog.c linux-2.4.20-pre1-nowayout/drivers/char/softdog.c
--- linux-2.4.20-pre1-settimeout/drivers/char/softdog.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/softdog.c Wed Aug 7 15:30:18 2002
@@ -31,6 +31,9 @@
* Added soft_noboot; Allows testing the softdog trigger without
* requiring a recompile.
* Added WDIOC_GETTIMEOUT and WDIOC_SETTIMOUT.
+ *
+ * 20020530 Joel Becker <[email protected]>
+ * Added Matt Domsch's nowayout module option.
*/
#include <linux/module.h>
@@ -59,6 +62,15 @@
MODULE_PARM(soft_noboot,"i");
MODULE_LICENSE("GPL");
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
/*
* Our timer
*/
@@ -95,9 +107,9 @@
{
if(test_and_set_bit(0, &timer_alive))
return -EBUSY;
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
- MOD_INC_USE_COUNT;
-#endif
+ if (nowayout) {
+ MOD_INC_USE_COUNT;
+ }
/*
* Activate timer
*/
@@ -109,11 +121,11 @@
{
/*
* Shut off the timer.
- * Lock it in if it's a module and we defined ...NOWAYOUT
+ * Lock it in if it's a module and we set nowayout
*/
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- del_timer(&watchdog_ticktock);
-#endif
+ if (!nowayout) {
+ del_timer(&watchdog_ticktock);
+ }
clear_bit(0, &timer_alive);
return 0;
}
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/wafer5823wdt.c linux-2.4.20-pre1-nowayout/drivers/char/wafer5823wdt.c
--- linux-2.4.20-pre1-settimeout/drivers/char/wafer5823wdt.c Wed Aug 7 15:24:03 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/wafer5823wdt.c Wed Aug 7 15:30:18 2002
@@ -56,6 +56,15 @@
#define WD_TIMO 60 /* 1 minute */
static int wd_margin = WD_TIMO;
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
static void wafwdt_ping(void)
{
/* pat watchdog */
@@ -148,9 +157,9 @@
wafwdt_close(struct inode *inode, struct file *file)
{
clear_bit(0, &wafwdt_is_open);
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- wafwdt_stop();
-#endif
+ if (!nowayout) {
+ wafwdt_stop();
+ }
return 0;
}
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/wdt.c linux-2.4.20-pre1-nowayout/drivers/char/wdt.c
--- linux-2.4.20-pre1-settimeout/drivers/char/wdt.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/wdt.c Wed Aug 7 15:30:18 2002
@@ -28,6 +28,7 @@
* Parameterized timeout
* Tigran Aivazian : Restructured wdt_init() to handle failures
* Joel Becker : Added WDIOC_GET/SETTIMEOUT
+ * Matt Domsch : Added nowayout module option
*/
#include <linux/config.h>
@@ -66,6 +67,15 @@
static int wd_margin = WD_TIMO;
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
#ifndef MODULE
/**
@@ -394,10 +404,10 @@
{
if(MINOR(inode->i_rdev)==WATCHDOG_MINOR)
{
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- inb_p(WDT_DC); /* Disable counters */
- wdt_ctr_load(2,0); /* 0 length reset pulses now */
-#endif
+ if (!nowayout) {
+ inb_p(WDT_DC); /* Disable counters */
+ wdt_ctr_load(2,0); /* 0 length reset pulses now */
+ }
clear_bit(0, &wdt_is_open);
}
return 0;
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/wdt977.c linux-2.4.20-pre1-nowayout/drivers/char/wdt977.c
--- linux-2.4.20-pre1-settimeout/drivers/char/wdt977.c Fri Sep 7 09:28:38 2001
+++ linux-2.4.20-pre1-nowayout/drivers/char/wdt977.c Wed Aug 7 15:30:18 2002
@@ -1,5 +1,5 @@
/*
- * Wdt977 0.01: A Watchdog Device for Netwinder W83977AF chip
+ * Wdt977 0.02: A Watchdog Device for Netwinder W83977AF chip
*
* (c) Copyright 1998 Rebel.com (Woody Suwalski <[email protected]>)
*
@@ -11,6 +11,8 @@
* 2 of the License, or (at your option) any later version.
*
* -----------------------
+ * 14-Dec-2001 Matt Domsch <[email protected]>
+ * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
*/
#include <linux/module.h>
@@ -32,6 +34,16 @@
static int timer_alive;
static int testmode;
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
+
/*
* Allow only one person to hold it open
*/
@@ -40,9 +52,9 @@
{
if(timer_alive)
return -EBUSY;
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
- MOD_INC_USE_COUNT;
-#endif
+ if (nowayout) {
+ MOD_INC_USE_COUNT;
+ }
timer_alive++;
//max timeout value = 255 minutes (0xFF). Write 0 to disable WatchDog.
@@ -89,9 +101,9 @@
{
/*
* Shut off the timer.
- * Lock it in if it's a module and we defined ...NOWAYOUT
+ * Lock it in if it's a module and we set nowayout
*/
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
+ if (!nowayout) { /* FIXME: not fixing indentation */
lock_kernel();
// unlock the SuperIO chip
@@ -127,7 +139,7 @@
unlock_kernel();
printk(KERN_INFO "Watchdog: shutdown.\n");
-#endif
+ }
return 0;
}
diff -uNr linux-2.4.20-pre1-settimeout/drivers/char/wdt_pci.c linux-2.4.20-pre1-nowayout/drivers/char/wdt_pci.c
--- linux-2.4.20-pre1-settimeout/drivers/char/wdt_pci.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-nowayout/drivers/char/wdt_pci.c Wed Aug 7 15:30:18 2002
@@ -32,6 +32,7 @@
* Tigran Aivazian : Restructured wdtpci_init_one() to handle failures
* Joel Becker : Added WDIOC_GET/SETTIMEOUT
* Zwane Mwaikambo : Magic char closing, locking changes, cleanups
+ * Matt Domsch : nowayout module option
*/
#include <linux/config.h>
@@ -87,6 +88,15 @@
static int wd_margin = WD_TIMO;
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
+static int nowayout = 1;
+#else
+static int nowayout = 0;
+#endif
+
+MODULE_PARM(nowayout,"i");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
/*
* Programming support
*/
@@ -231,16 +241,16 @@
return -ESPIPE;
if (count) {
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
- size_t i;
+ if (!nowayout) {
+ size_t i;
- expect_close = 0;
+ expect_close = 0;
- for (i = 0; i != count; i++) {
- if (buf[i] == 'V')
- expect_close = 1;
+ for (i = 0; i != count; i++) {
+ if (buf[i] == 'V')
+ expect_close = 1;
+ }
}
-#endif
wdtpci_ping();
}
@@ -355,12 +365,12 @@
switch(MINOR(inode->i_rdev))
{
case WATCHDOG_MINOR:
- if (down_trylock(&open_sem))
- return -EBUSY;
+ if (down_trylock(&open_sem))
+ return -EBUSY;
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
- MOD_INC_USE_COUNT;
-#endif
+ if (nowayout) {
+ MOD_INC_USE_COUNT;
+ }
/*
* Activate
*/
@@ -415,7 +425,6 @@
{
if (MINOR(inode->i_rdev)==WATCHDOG_MINOR) {
-#ifndef CONFIG_WATCHDOG_NOWAYOUT
unsigned long flags;
if (expect_close) {
spin_lock_irqsave(&wdtpci_lock, flags);
@@ -426,7 +435,6 @@
printk(KERN_CRIT PFX "Unexpected close, not stopping timer!");
wdtpci_ping();
}
-#endif
up(&open_sem);
}
return 0;
--
"Sometimes one pays most for the things one gets for nothing."
- Albert Einstein
Joel Becker
Senior Member of Technical Staff
Oracle Corporation
E-mail: [email protected]
Phone: (650) 506-8127
The third patch, fixing drivers that don't use get_user in their
magicclose code.
Joel
diff -uNr linux-2.4.20-pre1-nowayout/drivers/char/advantechwdt.c linux-2.4.20-pre1-magicclose-fix/drivers/char/advantechwdt.c
--- linux-2.4.20-pre1-nowayout/drivers/char/advantechwdt.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose-fix/drivers/char/advantechwdt.c Wed Aug 7 15:40:06 2002
@@ -125,7 +125,10 @@
adv_expect_close = 0;
for (i = 0; i != count; i++) {
- if (buf[i] == 'V')
+ char c;
+ if (get_user(c, buf + i))
+ return -EFAULT;
+ if (c == 'V')
adv_expect_close = 42;
}
}
diff -uNr linux-2.4.20-pre1-nowayout/drivers/char/alim7101_wdt.c linux-2.4.20-pre1-magicclose-fix/drivers/char/alim7101_wdt.c
--- linux-2.4.20-pre1-nowayout/drivers/char/alim7101_wdt.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose-fix/drivers/char/alim7101_wdt.c Wed Aug 7 15:40:06 2002
@@ -174,9 +174,13 @@
wdt_expect_close = 0;
/* now scan */
- for(ofs = 0; ofs != count; ofs++)
- if(buf[ofs] == 'V')
+ for(ofs = 0; ofs != count; ofs++) {
+ char c;
+ if(get_user(c, buf + ofs))
+ return -EFAULT;
+ if(c == 'V')
wdt_expect_close = 1;
+ }
}
/* someone wrote to us, we should restart timer */
diff -uNr linux-2.4.20-pre1-nowayout/drivers/char/eurotechwdt.c linux-2.4.20-pre1-magicclose-fix/drivers/char/eurotechwdt.c
--- linux-2.4.20-pre1-nowayout/drivers/char/eurotechwdt.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose-fix/drivers/char/eurotechwdt.c Wed Aug 7 15:40:06 2002
@@ -237,7 +237,10 @@
eur_expect_close = 0;
for (i = 0; i != count; i++) {
- if (buf[i] == 'V')
+ char c;
+ if (get_user(c, buf + i))
+ return -EFAULT;
+ if (c == 'V')
eur_expect_close = 42;
}
}
diff -uNr linux-2.4.20-pre1-nowayout/drivers/char/machzwd.c linux-2.4.20-pre1-magicclose-fix/drivers/char/machzwd.c
--- linux-2.4.20-pre1-nowayout/drivers/char/machzwd.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose-fix/drivers/char/machzwd.c Wed Aug 7 15:40:06 2002
@@ -329,7 +329,10 @@
/* now scan */
for(ofs = 0; ofs != count; ofs++){
- if(buf[ofs] == 'V'){
+ char c;
+ if(get_user(c, buf + ofs))
+ return -EFAULT;
+ if(c == 'V'){
zf_expect_close = 1;
dprintk("zf_expect_close 1\n");
}
diff -uNr linux-2.4.20-pre1-nowayout/drivers/char/sc1200wdt.c linux-2.4.20-pre1-magicclose-fix/drivers/char/sc1200wdt.c
--- linux-2.4.20-pre1-nowayout/drivers/char/sc1200wdt.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose-fix/drivers/char/sc1200wdt.c Wed Aug 7 15:40:06 2002
@@ -263,7 +263,10 @@
for (i = 0; i != len; i++)
{
- if (data[i] == 'V')
+ char c;
+ if (get_user(c, data + i))
+ return -EFAULT;
+ if (c == 'V')
expect_close = 42;
}
}
diff -uNr linux-2.4.20-pre1-nowayout/drivers/char/sc520_wdt.c linux-2.4.20-pre1-magicclose-fix/drivers/char/sc520_wdt.c
--- linux-2.4.20-pre1-nowayout/drivers/char/sc520_wdt.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose-fix/drivers/char/sc520_wdt.c Wed Aug 7 15:40:06 2002
@@ -210,9 +210,13 @@
wdt_expect_close = 0;
/* now scan */
- for(ofs = 0; ofs != count; ofs++)
- if(buf[ofs] == 'V')
+ for(ofs = 0; ofs != count; ofs++) {
+ char c;
+ if (get_user(c, buf + ofs))
+ return -EFAULT;
+ if(c == 'V')
wdt_expect_close = 1;
+ }
/* Well, anyhow someone wrote to us, we should return that favour */
next_heartbeat = jiffies + WDT_HEARTBEAT;
diff -uNr linux-2.4.20-pre1-nowayout/drivers/char/shwdt.c linux-2.4.20-pre1-magicclose-fix/drivers/char/shwdt.c
--- linux-2.4.20-pre1-nowayout/drivers/char/shwdt.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-magicclose-fix/drivers/char/shwdt.c Wed Aug 7 15:40:06 2002
@@ -237,7 +237,10 @@
shwdt_expect_close = 0;
for (i = 0; i != count; i++) {
- if (buf[i] == 'V')
+ char c;
+ if (get_user(c, buf + i))
+ return -EFAULT;
+ if (c == 'V')
shwdt_expect_close = 42;
}
next_heartbeat = jiffies + (sh_heartbeat * HZ);
diff -uNr linux-2.4.20-pre1-nowayout/drivers/char/w83877f_wdt.c linux-2.4.20-pre1-magicclose-fix/drivers/char/w83877f_wdt.c
--- linux-2.4.20-pre1-nowayout/drivers/char/w83877f_wdt.c Fri Aug 2 17:39:43 2002
+++ linux-2.4.20-pre1-magicclose-fix/drivers/char/w83877f_wdt.c Wed Aug 7 15:40:06 2002
@@ -192,8 +192,13 @@
/* now scan */
for(ofs = 0; ofs != count; ofs++)
- if(buf[ofs] == 'V')
+ {
+ char c;
+ if(get_user(c, buf + ofs))
+ return -EFAULT;
+ if(c == 'V')
wdt_expect_close = 1;
+ }
/* someone wrote to us, we should restart timer */
next_heartbeat = jiffies + WDT_HEARTBEAT;
diff -uNr linux-2.4.20-pre1-nowayout/drivers/char/wdt_pci.c linux-2.4.20-pre1-magicclose-fix/drivers/char/wdt_pci.c
--- linux-2.4.20-pre1-nowayout/drivers/char/wdt_pci.c Wed Aug 7 15:30:18 2002
+++ linux-2.4.20-pre1-magicclose-fix/drivers/char/wdt_pci.c Wed Aug 7 15:40:06 2002
@@ -247,7 +247,10 @@
expect_close = 0;
for (i = 0; i != count; i++) {
- if (buf[i] == 'V')
+ char c;
+ if (get_user(c, buf + i))
+ return -EFAULT;
+ if (c == 'V')
expect_close = 1;
}
}
--
Life's Little Instruction Book #20
"Be forgiving of yourself and others."
Joel Becker
Senior Member of Technical Staff
Oracle Corporation
E-mail: [email protected]
Phone: (650) 506-8127
You might cc the driver author...
>
> Here are four patches for the watchdog drivers. These patches
> are an update to 2.4.20-pre1 of the original set against 2.4.19-pre9.
> The first patch (this one) adds WDIOC_SETTIMEOUT support to
> wafer5823wdt.c. The second patch adds Matt Domsch's 'nowayout' module
> option to the drivers that currently don't have it. The third patch
> fixes a bug where most of the "magic close character" capable drivers
> don't use get_user(). The fourth patch adds "magic close character"
> support to almost all of the remaining drivers. It also adds
> WDIOF_MAGICCLOSE to the driver info flags.
>
> Joel
> +
> + case WDIOC_SETTIMEOUT:
> + if (get_user(new_margin, (int *)arg))
> + return -EFAULT;
> + if ((new_margin < 1) || (new_margin > 255))
> + return -EINVAL;
> + wd_margin = new_margin;
> + wafwdt_stop();
> + wafwdt_start();
> + /* Fall */
> + case WDIOC_GETTIMEOUT:
> + return put_user(wd_margin, (int *)arg);
I really wouldnt do wafwdt_stop(); wafwdt_start(); here. The new timeout
will be set on the next watchdog ping anyway, and you need to spin_lock
and unlock round this too. Much cleaner just to drop it.
Justin
On Thu, Aug 08, 2002 at 12:06:44PM +0000, [email protected] wrote:
> You might cc the driver author...
Sorry, with so many drivers to patch, I went with a recommended
list of "interested parties". I'll add you to that list. It is posted
to linux-kernel in the hopes that interested persons do get a chance to
look at it. I got no responses outside of my "interested parties" when
I posted this patch originally. It's good to hear from you.
> > +
> > + case WDIOC_SETTIMEOUT:
> > + if (get_user(new_margin, (int *)arg))
> > + return -EFAULT;
> > + if ((new_margin < 1) || (new_margin > 255))
> > + return -EINVAL;
> > + wd_margin = new_margin;
> > + wafwdt_stop();
> > + wafwdt_start();
> > + /* Fall */
> > + case WDIOC_GETTIMEOUT:
> > + return put_user(wd_margin, (int *)arg);
>
> I really wouldnt do wafwdt_stop(); wafwdt_start(); here. The new timeout
> will be set on the next watchdog ping anyway, and you need to spin_lock
> and unlock round this too. Much cleaner just to drop it.
Um, am I missreading:
59 static void wafwdt_ping(void)
60 {
61 /* pat watchdog */
62 spin_lock(&wafwdt_lock);
63 inb_p(WDT_STOP);
64 inb_p(WDT_START);
65 spin_unlock(&wafwdt_lock);
66 }
I don't see it writing the new timeout. Also, the semantic of
WDIOC_SETTIMEOUT (at least as I've implemented it in all the drivers
I've touched) is to ping the device to verify the new timeout is active.
I also note that the calls to wafwdt_stop()/start() in the
open()/close() functions doesn't take the spinlock. Granted, open() and
close() should be protected by wafwdt_is_open.
If I add the locking, are you comfortable with the changes?
Joel
--
"To fall in love is to create a religion that has a fallible god."
-Jorge Luis Borges
Joel Becker
Senior Member of Technical Staff
Oracle Corporation
E-mail: [email protected]
Phone: (650) 506-8127