vserver 1.9.5.x5

[linux-2.6.git] / drivers / char / watchdog / i8xx_tco.c

diff --git a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c
index 5fc0547..c337978 100644 (file)
--- a/drivers/char/watchdog/i8xx_tco.c
+++ b/drivers/char/watchdog/i8xx_tco.c
@@ -1,5 +1,5 @@
 /*
- *     i8xx_tco 0.06:  TCO timer driver for i8xx chipsets
+ *     i8xx_tco 0.07:  TCO timer driver for i8xx chipsets
  *
  *     (c) Copyright 2000 kernel concepts <nils@kernelconcepts.de>, All Rights Reserved.
  *                             http://www.kernelconcepts.de
@@ -22,11 +22,22 @@
  *
  *     The TCO timer is implemented in the following I/O controller hubs:
  *     (See the intel documentation on http://developer.intel.com.)
- *     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,
- *     82801DB & 82801E   chip : document number 290744-001, 273599-001,
- *     82801EB & 82801ER  chip : document number 252516-001
+ *     82801AA  (ICH)    : document number 290655-003, 290677-014,
+ *     82801AB  (ICHO)   : document number 290655-003, 290677-014,
+ *     82801BA  (ICH2)   : document number 290687-002, 298242-027,
+ *     82801BAM (ICH2-M) : document number 290687-002, 298242-027,
+ *     82801CA  (ICH3-S) : document number 290733-003, 290739-013,
+ *     82801CAM (ICH3-M) : document number 290716-001, 290718-007,
+ *     82801DB  (ICH4)   : document number 290744-001, 290745-020,
+ *     82801DBM (ICH4-M) : document number 252337-001, 252663-005,
+ *     82801E   (C-ICH)  : document number 273599-001, 273645-002,
+ *     82801EB  (ICH5)   : document number 252516-001, 252517-003,
+ *     82801ER  (ICH5R)  : document number 252516-001, 252517-003,
+ *     82801FB  (ICH6)   : document number 301473-002, 301474-007,
+ *     82801FR  (ICH6R)  : document number 301473-002, 301474-007,
+ *     82801FBM (ICH6-M) : document number 301473-002, 301474-007,
+ *     82801FW  (ICH6W)  : document number 301473-001, 301474-007,
+ *     82801FRW (ICH6RW) : document number 301473-001, 301474-007
  *
  *  20000710 Nils Faerber
  *     Initial Version 0.01
@@ -49,6 +60,9 @@
  *  20030921 Wim Van Sebroeck <wim@iguana.be>
  *     0.06 change i810_margin to heartbeat, use module_param,
  *          added notify system support, renamed module to i8xx_tco.
+ *  20050128 Wim Van Sebroeck <wim@iguana.be>
+ *     0.07 Added support for the ICH4-M, ICH6, ICH6R, ICH6-M, ICH6W and ICH6RW
+ *          chipsets. Also added support for the "undocumented" ICH7 chipset.
  */
 
 /*
@@ -73,7 +87,7 @@
 #include "i8xx_tco.h"
 
 /* Module and version information */
-#define TCO_VERSION "0.06"
+#define TCO_VERSION "0.07"
 #define TCO_MODULE_NAME "i8xx TCO timer"
 #define TCO_DRIVER_NAME   TCO_MODULE_NAME ", v" TCO_VERSION
 #define PFX TCO_MODULE_NAME ": "
@@ -360,8 +374,14 @@ static struct pci_device_id i8xx_tco_pci_tbl[] = {
        { 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_82801DB_0,   PCI_ANY_ID, PCI_ANY_ID, },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12,  PCI_ANY_ID, PCI_ANY_ID, },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0,    PCI_ANY_ID, PCI_ANY_ID, },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,   PCI_ANY_ID, PCI_ANY_ID, },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0,      PCI_ANY_ID, PCI_ANY_ID, },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,      PCI_ANY_ID, PCI_ANY_ID, },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2,      PCI_ANY_ID, PCI_ANY_ID, },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,      PCI_ANY_ID, PCI_ANY_ID, },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,      PCI_ANY_ID, PCI_ANY_ID, },
        { 0, },                 /* End of list */
 };
 MODULE_DEVICE_TABLE (pci, i8xx_tco_pci_tbl);
@@ -415,12 +435,15 @@ static unsigned char __init i8xx_tco_getdevice (void)
                        }
                }
                /* Set the TCO_EN bit in SMI_EN register */
+               if (!request_region (SMI_EN + 1, 1, "i8xx TCO")) {
+                       printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
+                               SMI_EN + 1);
+                       return 0;
+               }
                val1 = inb (SMI_EN + 1);
                val1 &= 0xdf;
                outb (val1, SMI_EN + 1);
-               /* Clear out the (probably old) status */
-               outb (0, TCO1_STS);
-               outb (3, TCO2_STS);
+               release_region (SMI_EN + 1, 1);
                return 1;
        }
        return 0;
@@ -443,6 +466,10 @@ static int __init watchdog_init (void)
                goto out;
        }
 
+       /* Clear out the (probably old) status */
+       outb (0, TCO1_STS);
+       outb (3, TCO2_STS);
+
        /* Check that the heartbeat value is within it's range ; if not reset to the default */
        if (tco_timer_set_heartbeat (heartbeat)) {
                heartbeat = WATCHDOG_HEARTBEAT;
@@ -465,7 +492,7 @@ static int __init watchdog_init (void)
                goto unreg_notifier;
        }
 
-       tco_timer_keepalive ();
+       tco_timer_stop ();
 
        printk (KERN_INFO PFX "initialized (0x%04x). heartbeat=%d sec (nowayout=%d)\n",
                TCOBASE, heartbeat, nowayout);