Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/char/watchdog/alim7101_wdt.c
index fb62ddb..c05ac18 100644 (file)
--- a/drivers/char/watchdog/alim7101_wdt.c
+++ b/drivers/char/watchdog/alim7101_wdt.c
@@ -12,6 +12,11 @@
  *  because this particular WDT has a very short timeout (1.6
  *  seconds) and it would be insane to count on any userspace
  *  daemon always getting scheduled within that time frame.
+ *
+ *  Additions:
+ *   Aug 23, 2004 - Added use_gpio module parameter for use on revision a1d PMUs
+ *                  found on very old cobalt hardware.
+ *                  -- Mike Waychison <michael.waychison@sun.com>
  */
 
 #include <linux/module.h>
@@ -24,6 +29,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/fs.h>
 #include <linux/pci.h>
 
 #include <asm/io.h>
@@ -37,6 +43,8 @@
 #define WDT_DISABLE 0x8C
 
 #define ALI_7101_WDT    0x92
+#define ALI_7101_GPIO   0x7D
+#define ALI_7101_GPIO_O 0x7E
 #define ALI_WDT_ARM     0x01
 
 /*
@@ -56,6 +64,10 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds, will be multiplied by HZ t
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
 
+static int use_gpio = 0; /* Use the pic (for a1d revision alim7101) */
+module_param(use_gpio, int, 0);
+MODULE_PARM_DESC(use_gpio, "Use the gpio watchdog.  (required by old cobalt boards)");
+
 static void wdt_timer_ping(unsigned long);
 static struct timer_list timer;
 static unsigned long next_heartbeat;
@@ -63,12 +75,7 @@ static unsigned long wdt_is_open;
 static char wdt_expect_close;
 static struct pci_dev *alim7101_pmu;
 
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
-static int nowayout = 1;
-#else
-static int nowayout = 0;
-#endif
-
+static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
 
@@ -89,6 +96,13 @@ static void wdt_timer_ping(unsigned long data)
                pci_read_config_byte(alim7101_pmu, 0x92, &tmp);
                pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, (tmp & ~ALI_WDT_ARM));
                pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, (tmp | ALI_WDT_ARM));
+               if (use_gpio) {
+                       pci_read_config_byte(alim7101_pmu, ALI_7101_GPIO_O, &tmp);
+                       pci_write_config_byte(alim7101_pmu, ALI_7101_GPIO_O, tmp
+                                       | 0x20);
+                       pci_write_config_byte(alim7101_pmu, ALI_7101_GPIO_O, tmp
+                                       & ~0x20);
+               }
        } else {
                printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n");
        }
@@ -105,11 +119,21 @@ static void wdt_change(int writeval)
 {
        char    tmp;
 
-       pci_read_config_byte(alim7101_pmu, 0x92, &tmp);
-       if (writeval == WDT_ENABLE)
+       pci_read_config_byte(alim7101_pmu, ALI_7101_WDT, &tmp);
+       if (writeval == WDT_ENABLE) {
                pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, (tmp | ALI_WDT_ARM));
-       else
+               if (use_gpio) {
+                       pci_read_config_byte(alim7101_pmu, ALI_7101_GPIO_O, &tmp);
+                       pci_write_config_byte(alim7101_pmu, ALI_7101_GPIO_O, tmp & ~0x20);
+               }
+
+       } else {
                pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, (tmp & ~ALI_WDT_ARM));
+               if (use_gpio) {
+                       pci_read_config_byte(alim7101_pmu, ALI_7101_GPIO_O, &tmp);
+                       pci_write_config_byte(alim7101_pmu, ALI_7101_GPIO_O, tmp | 0x20);
+               }
+       }
 }
 
 static void wdt_startup(void)
@@ -147,12 +171,8 @@ static void wdt_keepalive(void)
  * /dev/watchdog handling
  */
 
-static ssize_t fop_write(struct file * file, const char * buf, size_t count, loff_t * ppos)
+static ssize_t fop_write(struct file * file, const char __user * buf, size_t count, loff_t * ppos)
 {
-       /* We can't seek */
-       if(ppos != &file->f_pos)
-               return -ESPIPE;
-
        /* See if we got the magic character 'V' and reload the timer */
        if(count) {
                if (!nowayout) {
@@ -184,7 +204,7 @@ static int fop_open(struct inode * inode, struct file * file)
                return -EBUSY;
        /* Good, fire up the show */
        wdt_startup();
-       return 0;
+       return nonseekable_open(inode, file);
 }
 
 static int fop_close(struct inode * inode, struct file * file)
@@ -202,6 +222,8 @@ static int fop_close(struct inode * inode, struct file * file)
 
 static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
+       void __user *argp = (void __user *)arg;
+       int __user *p = argp;
        static struct watchdog_info ident =
        {
                .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
@@ -212,10 +234,10 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
        switch(cmd)
        {
                case WDIOC_GETSUPPORT:
-                       return copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident))?-EFAULT:0;
+                       return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
                case WDIOC_GETSTATUS:
                case WDIOC_GETBOOTSTATUS:
-                       return put_user(0, (int *)arg);
+                       return put_user(0, p);
                case WDIOC_KEEPALIVE:
                        wdt_keepalive();
                        return 0;
@@ -223,7 +245,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
                {
                        int new_options, retval = -EINVAL;
 
-                       if(get_user(new_options, (int *)arg))
+                       if(get_user(new_options, p))
                                return -EFAULT;
 
                        if(new_options & WDIOS_DISABLECARD) {
@@ -242,7 +264,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
                {
                        int new_timeout;
 
-                       if(get_user(new_timeout, (int *)arg))
+                       if(get_user(new_timeout, p))
                                return -EFAULT;
 
                        if(new_timeout < 1 || new_timeout > 3600) /* arbitrary upper limit */
@@ -253,7 +275,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
                        /* Fall through */
                }
                case WDIOC_GETTIMEOUT:
-                       return put_user(timeout, (int *)arg);
+                       return put_user(timeout, p);
                default:
                        return -ENOIOCTLCMD;
        }
@@ -335,7 +357,13 @@ static int __init alim7101_wdt_init(void)
                return -EBUSY;
        }
        pci_read_config_byte(ali1543_south, 0x5e, &tmp);
-       if ((tmp & 0x1e) != 0x12) {
+       if ((tmp & 0x1e) == 0x00) {
+               if (!use_gpio) {
+                       printk(KERN_INFO PFX "Detected old alim7101 revision 'a1d'.  If this is a cobalt board, set the 'use_gpio' module parameter.\n");
+                       return -EBUSY;
+               } 
+               nowayout = 1;
+       } else if ((tmp & 0x1e) != 0x12 && (tmp & 0x1e) != 0x00) {
                printk(KERN_INFO PFX "ALi 1543 South-Bridge does not have the correct revision number (???1001?) - WDT not set\n");
                return -EBUSY;
        }
@@ -365,6 +393,10 @@ static int __init alim7101_wdt_init(void)
                goto err_out_miscdev;
        }
 
+       if (nowayout) {
+               __module_get(THIS_MODULE);
+       }
+
        printk(KERN_INFO PFX "WDT driver for ALi M7101 initialised. timeout=%d sec (nowayout=%d)\n",
                timeout, nowayout);
        return 0;