Skip to content

L
linux
Commit 7e6fac28 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files
Options

[PATCH] i810-tco update 

i810-tco: Upgrade to version 0.05 .

Fix possible timer_alive race, add expect close support,
clean up ioctls (WDIOC_GETSTATUS, WDIOC_GETBOOTSTATUS and
WDIOC_SETOPTIONS), made i810tco_getdevice __init,
removed boot_status, removed tco_timer_read,
added support for 82801DB and 82801E chipset, general cleanup.
parent 4b6c10e2
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 81 deletions
drivers/char/i810-tco.c
View file @ 7e6fac28
/* /*
* i810-tco 0.04: TCO timer driver for i8xx chipsets * i810-tco 0.05: TCO timer driver for i8xx chipsets
* *
* (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de>, All Rights Reserved. * (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de>, All Rights Reserved.
* http://www.kernelconcepts.de * http://www.kernelconcepts.de
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
* *
* Neither kernel concepts nor Nils Faerber admit liability nor provide * Neither kernel concepts nor Nils Faerber admit liability nor provide
* warranty for any of this software. This material is provided * warranty for any of this software. This material is provided
* "AS-IS" and at no charge. * "AS-IS" and at no charge.
* *
* (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de> * (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de>
* developed for * developed for
...@@ -24,18 +24,25 @@ ...@@ -24,18 +24,25 @@
* (See the intel documentation on http://developer.intel.com.) * (See the intel documentation on http://developer.intel.com.)
* 82801AA & 82801AB chip : document number 290655-003, 290677-004, * 82801AA & 82801AB chip : document number 290655-003, 290677-004,
* 82801BA & 82801BAM chip : document number 290687-002, 298242-005, * 82801BA & 82801BAM chip : document number 290687-002, 298242-005,
* 82801CA & 82801CAM chip : document number 290716-001, 290718-001 * 82801CA & 82801CAM chip : document number 290716-001, 290718-001,
* 82801DB & 82801E chip : document number 290744-001, 273599-001
* *
* 20000710 Nils Faerber * 20000710 Nils Faerber
* Initial Version 0.01 * Initial Version 0.01
* 20000728 Nils Faerber * 20000728 Nils Faerber
* 0.02 Fix for SMI_EN->TCO_EN bit, some cleanups * 0.02 Fix for SMI_EN->TCO_EN bit, some cleanups
* 20011214 Matt Domsch <Matt_Domsch@dell.com> * 20011214 Matt Domsch <Matt_Domsch@dell.com>
* 0.03 Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * 0.03 Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
* Didn't add timeout option as i810_margin already exists. * Didn't add timeout option as i810_margin already exists.
* 20020224 Joel Becker, Wim Van Sebroeck * 20020224 Joel Becker, Wim Van Sebroeck
* 0.04 Support for 82801CA(M) chipset, timer margin needs to be > 3, * 0.04 Support for 82801CA(M) chipset, timer margin needs to be > 3,
* add support for WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT. * add support for WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT.
* 20020412 Rob Radez <rob@osinvestor.com>, Wim Van Sebroeck
* 0.05 Fix possible timer_alive race, add expect close support,
* clean up ioctls (WDIOC_GETSTATUS, WDIOC_GETBOOTSTATUS and
* WDIOC_SETOPTIONS), made i810tco_getdevice __init,
* removed boot_status, removed tco_timer_read,
* added support for 82801DB and 82801E chipset, general cleanup.
*/ */
#include <linux/module.h> #include <linux/module.h>
...@@ -55,9 +62,9 @@ ...@@ -55,9 +62,9 @@
/* Module and version information */ /* Module and version information */
#define TCO_VERSION "0.04" #define TCO_VERSION "0.05"
#define TCO_MODULE_NAME "i810 TCO timer" #define TCO_MODULE_NAME "i810 TCO timer"
#define TCO_DRIVER_NAME TCO_MODULE_NAME " , " TCO_VERSION #define TCO_DRIVER_NAME TCO_MODULE_NAME ", v" TCO_VERSION
/* Default expire timeout */ /* Default expire timeout */
#define TIMER_MARGIN 50 /* steps of 0.6sec, 3<n<64. Default is 30 seconds */ #define TIMER_MARGIN 50 /* steps of 0.6sec, 3<n<64. Default is 30 seconds */
...@@ -67,9 +74,8 @@ static spinlock_t tco_lock; /* Guards the hardware */ ...@@ -67,9 +74,8 @@ static spinlock_t tco_lock; /* Guards the hardware */
static int i810_margin = TIMER_MARGIN; /* steps of 0.6sec */ static int i810_margin = TIMER_MARGIN; /* steps of 0.6sec */
MODULE_PARM (i810_margin, "i"); MODULE_PARM(i810_margin, "i");
MODULE_PARM_DESC(i810_margin, "Watchdog timeout in steps of 0.6sec, 3<n<64. Default = 50 (30 seconds)"); MODULE_PARM_DESC(i810_margin, "i810-tco timeout in steps of 0.6sec, 3<n<64. Default = 50 (30 seconds)");
#ifdef CONFIG_WATCHDOG_NOWAYOUT #ifdef CONFIG_WATCHDOG_NOWAYOUT
static int nowayout = 1; static int nowayout = 1;
...@@ -85,8 +91,8 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CON ...@@ -85,8 +91,8 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CON
* Timer active flag * Timer active flag
*/ */
static int timer_alive; static unsigned long timer_alive;
static int boot_status; static char tco_expect_close;
/* /*
* Some TCO specific functions * Some TCO specific functions
...@@ -169,33 +175,20 @@ static void tco_timer_reload (void) ...@@ -169,33 +175,20 @@ static void tco_timer_reload (void)
spin_unlock(&tco_lock); spin_unlock(&tco_lock);
} }
/*
* Read the current timer value
*/
static unsigned char tco_timer_read (void)
{
return (inb (TCO1_RLD));
}
/* /*
* Allow only one person to hold it open * Allow only one person to hold it open
*/ */
static int i810tco_open (struct inode *inode, struct file *file) static int i810tco_open (struct inode *inode, struct file *file)
{ {
if (timer_alive) if (test_and_set_bit(0, &timer_alive))
return -EBUSY; return -EBUSY;
if (nowayout) {
MOD_INC_USE_COUNT;
}
/* /*
* Reload and activate timer * Reload and activate timer
*/ */
tco_timer_reload (); tco_timer_reload ();
tco_timer_start (); tco_timer_start ();
timer_alive = 1;
return 0; return 0;
} }
...@@ -204,10 +197,14 @@ static int i810tco_release (struct inode *inode, struct file *file) ...@@ -204,10 +197,14 @@ static int i810tco_release (struct inode *inode, struct file *file)
/* /*
* Shut off the timer. * Shut off the timer.
*/ */
if (nowayout) { if (tco_expect_close == 42 && !nowayout) {
tco_timer_stop (); tco_timer_stop ();
timer_alive = 0; } else {
tco_timer_reload ();
printk(KERN_CRIT TCO_MODULE_NAME ": Unexpected close, not stopping watchdog!\n");
} }
clear_bit(0, &timer_alive);
tco_expect_close = 0;
return 0; return 0;
} }
...@@ -218,10 +215,22 @@ static ssize_t i810tco_write (struct file *file, const char *data, ...@@ -218,10 +215,22 @@ static ssize_t i810tco_write (struct file *file, const char *data,
if (ppos != &file->f_pos) if (ppos != &file->f_pos)
return -ESPIPE; return -ESPIPE;
/* /* See if we got the magic character 'V' and reload the timer */
* Refresh the timer.
*/
if (len) { if (len) {
size_t i;
tco_expect_close = 0;
/* scan to see wether or not we got the magic character */
for (i = 0; i != len; i++) {
u8 c;
if(get_user(c, data+i))
return -EFAULT;
if (c == 'V')
tco_expect_close = 42;
}
/* someone wrote to us, we should reload the timer */
tco_timer_reload (); tco_timer_reload ();
return 1; return 1;
} }
...@@ -232,41 +241,53 @@ static int i810tco_ioctl (struct inode *inode, struct file *file, ...@@ -232,41 +241,53 @@ static int i810tco_ioctl (struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
int new_margin, u_margin; int new_margin, u_margin;
int options, retval = -EINVAL;
static struct watchdog_info ident = { static struct watchdog_info ident = {
WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, options: WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
0, firmware_version: 0,
"i810 TCO timer" identity: "i810 TCO timer",
}; };
switch (cmd) { switch (cmd) {
default: default:
return -ENOTTY; return -ENOTTY;
case WDIOC_GETSUPPORT: case WDIOC_GETSUPPORT:
if (copy_to_user if (copy_to_user
((struct watchdog_info *) arg, &ident, sizeof (ident))) ((struct watchdog_info *) arg, &ident, sizeof (ident)))
return -EFAULT; return -EFAULT;
return 0; return 0;
case WDIOC_GETSTATUS: case WDIOC_GETSTATUS:
return put_user (tco_timer_read (), case WDIOC_GETBOOTSTATUS:
(unsigned int *) (int) arg); return put_user (0, (int *) arg);
case WDIOC_GETBOOTSTATUS: case WDIOC_SETOPTIONS:
return put_user (boot_status, (int *) arg); if (get_user (options, (int *) arg))
case WDIOC_KEEPALIVE: return -EFAULT;
tco_timer_reload (); if (options & WDIOS_DISABLECARD) {
return 0; tco_timer_stop ();
case WDIOC_SETTIMEOUT: retval = 0;
if (get_user(u_margin, (int *) arg)) }
return -EFAULT; if (options & WDIOS_ENABLECARD) {
new_margin = (u_margin * 10 + 5) / 6; tco_timer_reload ();
if ((new_margin < 4) || (new_margin > 63)) tco_timer_start ();
return -EINVAL; retval = 0;
if (tco_timer_settimer((unsigned char)new_margin)) }
return -EINVAL; return retval;
i810_margin = new_margin; case WDIOC_KEEPALIVE:
tco_timer_reload(); tco_timer_reload ();
/* Fall */ return 0;
case WDIOC_GETTIMEOUT: case WDIOC_SETTIMEOUT:
return put_user((int)(i810_margin * 6 / 10), (int *) arg); if (get_user (u_margin, (int *) arg))
return -EFAULT;
new_margin = (u_margin * 10 + 5) / 6;
if ((new_margin < 4) || (new_margin > 63))
return -EINVAL;
if (tco_timer_settimer ((unsigned char) new_margin))
return -EINVAL;
i810_margin = new_margin;
tco_timer_reload ();
/* Fall */
case WDIOC_GETTIMEOUT:
return put_user ((int)(i810_margin * 6 / 10), (int *) arg);
} }
} }
...@@ -285,13 +306,15 @@ static struct pci_device_id i810tco_pci_tbl[] __initdata = { ...@@ -285,13 +306,15 @@ static struct pci_device_id i810tco_pci_tbl[] __initdata = {
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10, PCI_ANY_ID, PCI_ANY_ID, },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, PCI_ANY_ID, PCI_ANY_ID, },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12, PCI_ANY_ID, PCI_ANY_ID, },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, PCI_ANY_ID, PCI_ANY_ID, },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0, PCI_ANY_ID, PCI_ANY_ID, },
{ 0, }, { 0, },
}; };
MODULE_DEVICE_TABLE (pci, i810tco_pci_tbl); MODULE_DEVICE_TABLE (pci, i810tco_pci_tbl);
static struct pci_dev *i810tco_pci; static struct pci_dev *i810tco_pci;
static unsigned char i810tco_getdevice (void) static unsigned char __init i810tco_getdevice (void)
{ {
struct pci_dev *dev; struct pci_dev *dev;
u8 val1, val2; u8 val1, val2;
...@@ -341,7 +364,6 @@ static unsigned char i810tco_getdevice (void) ...@@ -341,7 +364,6 @@ static unsigned char i810tco_getdevice (void)
outb (val1, SMI_EN + 1); outb (val1, SMI_EN + 1);
/* Clear out the (probably old) status */ /* Clear out the (probably old) status */
outb (0, TCO1_STS); outb (0, TCO1_STS);
boot_status = (int) inb (TCO2_STS);
outb (3, TCO2_STS); outb (3, TCO2_STS);
return 1; return 1;
} }
...@@ -357,9 +379,9 @@ static struct file_operations i810tco_fops = { ...@@ -357,9 +379,9 @@ static struct file_operations i810tco_fops = {
}; };
static struct miscdevice i810tco_miscdev = { static struct miscdevice i810tco_miscdev = {
WATCHDOG_MINOR, minor: WATCHDOG_MINOR,
"watchdog", name: "watchdog",
&i810tco_fops fops: &i810tco_fops,
}; };
static int __init watchdog_init (void) static int __init watchdog_init (void)
...@@ -382,8 +404,8 @@ static int __init watchdog_init (void) ...@@ -382,8 +404,8 @@ static int __init watchdog_init (void)
tco_timer_reload (); tco_timer_reload ();
printk (KERN_INFO TCO_DRIVER_NAME printk (KERN_INFO TCO_DRIVER_NAME
": timer margin: %d sec (0x%04x)\n", ": timer margin: %d sec (0x%04x) (nowayout=%d)\n",
(int) (i810_margin * 6 / 10), TCOBASE); (int) (i810_margin * 6 / 10), TCOBASE, nowayout);
return 0; return 0;
} }
...@@ -404,4 +426,6 @@ static void __exit watchdog_cleanup (void) ...@@ -404,4 +426,6 @@ static void __exit watchdog_cleanup (void)
module_init(watchdog_init); module_init(watchdog_init);
module_exit(watchdog_cleanup); module_exit(watchdog_cleanup);
MODULE_AUTHOR("Nils Faerber");
MODULE_DESCRIPTION("TCO timer driver for i8xx chipsets");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/char/i810-tco.h
View file @ 7e6fac28
/* /*
* i810-tco 0.04: TCO timer driver for i8xx chipsets * i810-tco 0.05: TCO timer driver for i8xx chipsets
* *
* (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de>, All Rights Reserved. * (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de>, All Rights Reserved.
* http://www.kernelconcepts.de * http://www.kernelconcepts.de
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
* *
* Neither kernel concepts nor Nils Faerber admit liability nor provide * Neither kernel concepts nor Nils Faerber admit liability nor provide
* warranty for any of this software. This material is provided * warranty for any of this software. This material is provided
* "AS-IS" and at no charge. * "AS-IS" and at no charge.
* *
* (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de> * (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de>
* developed for * developed for
...@@ -20,13 +20,8 @@ ...@@ -20,13 +20,8 @@
* TCO timer driver for i8xx chipsets * TCO timer driver for i8xx chipsets
* based on softdog.c by Alan Cox <alan@redhat.com> * based on softdog.c by Alan Cox <alan@redhat.com>
* *
* The TCO timer is implemented in the following I/O controller hubs: * For history and the complete list of supported I/O Controller Hub's
* (See the intel documentation on http://developer.intel.com.) * see i810-tco.c
* 82801AA & 82801AB chip : document number 290655-003, 290677-004,
* 82801BA & 82801BAM chip : document number 290687-002, 298242-005,
* 82801CA & 82801CAM chip : document number 290716-001, 290718-001
*
* For history see i810-tco.c
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7