Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

5 files changed, 479 insertions, 6 deletions

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index a6544790af60..c0dfcf273f0a 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -395,12 +395,38 @@ config MACHZ_WDT
           To compile this driver as a module, choose M here: the
           module will be called machzwd.
 
+config SBC_EPX_C3_WATCHDOG
+        tristate "Winsystems SBC EPX-C3 watchdog"
+        depends on WATCHDOG && X86
+        ---help---
+          This is the driver for the built-in watchdog timer on the EPX-C3
+          Single-board computer made by Winsystems, Inc.
+
+          *Note*: This hardware watchdog is not probeable and thus there
+          is no way to know if writing to its IO address will corrupt
+          your system or have any real effect.  The only way to be sure
+          that this driver does what you want is to make sure you
+          are runnning it on an EPX-C3 from Winsystems with the watchdog
+          timer at IO address 0x1ee and 0x1ef.  It will write to both those
+          IO ports.  Basically, the assumption is made that if you compile
+          this driver into your kernel and/or load it as a module, that you
+          know what you are doing and that you are in fact running on an
+          EPX-C3 board!
+
+          To compile this driver as a module, choose M here: the
+          module will be called sbc_epx_c3.
+
+
 # PowerPC Architecture
 
 config 8xx_WDT
         tristate "MPC8xx Watchdog Timer"
         depends on WATCHDOG && 8xx
 
+config 83xx_WDT
+        tristate "MPC83xx Watchdog Timer"
+        depends on WATCHDOG && PPC_83xx
+
 config MV64X60_WDT
         tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
         depends on WATCHDOG && MV64X60
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index cfd0a3987710..36c0b282b8ba 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -52,9 +52,11 @@ obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
 obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
 obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
 obj-$(CONFIG_MACHZ_WDT) += machzwd.o
+obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
 
 # PowerPC Architecture
 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+obj-$(CONFIG_83xx_WDT) += mpc83xx_wdt.o
 obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
 obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
 
diff --git a/drivers/char/watchdog/mpc83xx_wdt.c b/drivers/char/watchdog/mpc83xx_wdt.c
new file mode 100644
index 000000000000..5d6f5061603a
--- /dev/null
+++ b/drivers/char/watchdog/mpc83xx_wdt.c
@@ -0,0 +1,229 @@
+/*
+ * mpc83xx_wdt.c - MPC83xx watchdog userspace interface
+ *
+ * Authors: Dave Updegraff <dave@cray.org>
+ *          Kumar Gala <galak@kernel.crashing.org>
+ *              Attribution: from 83xx_wst: Florian Schirmer <jolt@tuxbox.org>
+ *                              ..and from sc520_wdt
+ *
+ * Note: it appears that you can only actually ENABLE or DISABLE the thing
+ * once after POR. Once enabled, you cannot disable, and vice versa.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/watchdog.h>
+#include <asm/io.h>
+#include <asm/uaccess.h>
+
+struct mpc83xx_wdt {
+        __be32 res0;
+        __be32 swcrr; /* System watchdog control register */
+#define SWCRR_SWTC 0xFFFF0000 /* Software Watchdog Time Count. */
+#define SWCRR_SWEN 0x00000004 /* Watchdog Enable bit. */
+#define SWCRR_SWRI 0x00000002 /* Software Watchdog Reset/Interrupt Select bit.*/
+#define SWCRR_SWPR 0x00000001 /* Software Watchdog Counter Prescale bit. */
+        __be32 swcnr; /* System watchdog count register */
+        u8 res1[2];
+        __be16 swsrr; /* System watchdog service register */
+        u8 res2[0xF0];
+};
+
+static struct mpc83xx_wdt __iomem *wd_base;
+
+static u16 timeout = 0xffff;
+module_param(timeout, ushort, 0);
+MODULE_PARM_DESC(timeout, "Watchdog timeout in ticks. (0<timeout<65536, default=65535");
+
+static int reset = 1;
+module_param(reset, bool, 0);
+MODULE_PARM_DESC(reset, "Watchdog Interrupt/Reset Mode. 0 = interrupt, 1 = reset");
+
+/*
+ * We always prescale, but if someone really doesn't want to they can set this
+ * to 0
+ */
+static int prescale = 1;
+static unsigned int timeout_sec;
+
+static unsigned long wdt_is_open;
+static spinlock_t wdt_spinlock;
+
+static void mpc83xx_wdt_keepalive(void)
+{
+        /* Ping the WDT */
+        spin_lock(&wdt_spinlock);
+        out_be16(&wd_base->swsrr, 0x556c);
+        out_be16(&wd_base->swsrr, 0xaa39);
+        spin_unlock(&wdt_spinlock);
+}
+
+static ssize_t mpc83xx_wdt_write(struct file *file, const char __user *buf,
+                                 size_t count, loff_t *ppos)
+{
+        if (count)
+                mpc83xx_wdt_keepalive();
+        return count;
+}
+
+static int mpc83xx_wdt_open(struct inode *inode, struct file *file)
+{
+        u32 tmp = SWCRR_SWEN;
+        if (test_and_set_bit(0, &wdt_is_open))
+                return -EBUSY;
+
+        /* Once we start the watchdog we can't stop it */
+        __module_get(THIS_MODULE);
+
+        /* Good, fire up the show */
+        if (prescale)
+                tmp |= SWCRR_SWPR;
+        if (reset)
+                tmp |= SWCRR_SWRI;
+
+        tmp |= timeout << 16;
+
+        out_be32(&wd_base->swcrr, tmp);
+
+        return nonseekable_open(inode, file);
+}
+
+static int mpc83xx_wdt_release(struct inode *inode, struct file *file)
+{
+        printk(KERN_CRIT "Unexpected close, not stopping watchdog!\n");
+        mpc83xx_wdt_keepalive();
+        clear_bit(0, &wdt_is_open);
+        return 0;
+}
+
+static int mpc83xx_wdt_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,
+                .firmware_version = 1,
+                .identity = "MPC83xx",
+        };
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
+        case WDIOC_KEEPALIVE:
+                mpc83xx_wdt_keepalive();
+                return 0;
+        case WDIOC_GETTIMEOUT:
+                return put_user(timeout_sec, p);
+        default:
+                return -ENOIOCTLCMD;
+        }
+}
+
+static struct file_operations mpc83xx_wdt_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .write          = mpc83xx_wdt_write,
+        .ioctl          = mpc83xx_wdt_ioctl,
+        .open           = mpc83xx_wdt_open,
+        .release        = mpc83xx_wdt_release,
+};
+
+static struct miscdevice mpc83xx_wdt_miscdev = {
+        .minor  = WATCHDOG_MINOR,
+        .name   = "watchdog",
+        .fops   = &mpc83xx_wdt_fops,
+};
+
+static int __devinit mpc83xx_wdt_probe(struct platform_device *dev)
+{
+        struct resource *r;
+        int ret;
+        unsigned int *freq = dev->dev.platform_data;
+
+        /* get a pointer to the register memory */
+        r = platform_get_resource(dev, IORESOURCE_MEM, 0);
+
+        if (!r) {
+                ret = -ENODEV;
+                goto err_out;
+        }
+
+        wd_base = ioremap(r->start, sizeof (struct mpc83xx_wdt));
+
+        if (wd_base == NULL) {
+                ret = -ENOMEM;
+                goto err_out;
+        }
+
+        ret = misc_register(&mpc83xx_wdt_miscdev);
+        if (ret) {
+                printk(KERN_ERR "cannot register miscdev on minor=%d "
+                                "(err=%d)\n",
+                                WATCHDOG_MINOR, ret);
+                goto err_unmap;
+        }
+
+        /* Calculate the timeout in seconds */
+        if (prescale)
+                timeout_sec = (timeout * 0x10000) / (*freq);
+        else
+                timeout_sec = timeout / (*freq);
+
+        printk(KERN_INFO "WDT driver for MPC83xx initialized. "
+                "mode:%s timeout=%d (%d seconds)\n",
+                reset ? "reset":"interrupt", timeout, timeout_sec);
+
+        spin_lock_init(&wdt_spinlock);
+
+        return 0;
+
+err_unmap:
+        iounmap(wd_base);
+err_out:
+        return ret;
+}
+
+static int __devexit mpc83xx_wdt_remove(struct platform_device *dev)
+{
+        misc_deregister(&mpc83xx_wdt_miscdev);
+        iounmap(wd_base);
+
+        return 0;
+}
+
+static struct platform_driver mpc83xx_wdt_driver = {
+        .probe          = mpc83xx_wdt_probe,
+        .remove         = __devexit_p(mpc83xx_wdt_remove),
+        .driver         = {
+                .name   = "mpc83xx_wdt",
+        },
+};
+
+static int __init mpc83xx_wdt_init(void)
+{
+        return platform_driver_register(&mpc83xx_wdt_driver);
+}
+
+static void __exit mpc83xx_wdt_exit(void)
+{
+        platform_driver_unregister(&mpc83xx_wdt_driver);
+}
+
+module_init(mpc83xx_wdt_init);
+module_exit(mpc83xx_wdt_exit);
+
+MODULE_AUTHOR("Dave Updegraff, Kumar Gala");
+MODULE_DESCRIPTION("Driver for watchdog timer in MPC83xx uProcessor");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c
index fb88b4041dca..b474ea52d6e8 100644
--- a/drivers/char/watchdog/sa1100_wdt.c
+++ b/drivers/char/watchdog/sa1100_wdt.c
@@ -74,7 +74,7 @@ static int sa1100dog_release(struct inode *inode, struct file *file)
         return 0;
 }
 
-static ssize_t sa1100dog_write(struct file *file, const char *data, size_t len, loff_t *ppos)
+static ssize_t sa1100dog_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
 {
         if (len)
                 /* Refresh OSMR3 timer. */
@@ -96,20 +96,20 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
         case WDIOC_GETSUPPORT:
-                ret = copy_to_user((struct watchdog_info *)arg, &ident,
+                ret = copy_to_user((struct watchdog_info __user *)arg, &ident,
                                    sizeof(ident)) ? -EFAULT : 0;
                 break;
 
         case WDIOC_GETSTATUS:
-                ret = put_user(0, (int *)arg);
+                ret = put_user(0, (int __user *)arg);
                 break;
 
         case WDIOC_GETBOOTSTATUS:
-                ret = put_user(boot_status, (int *)arg);
+                ret = put_user(boot_status, (int __user *)arg);
                 break;
 
         case WDIOC_SETTIMEOUT:
-                ret = get_user(time, (int *)arg);
+                ret = get_user(time, (int __user *)arg);
                 if (ret)
                         break;
 
@@ -123,7 +123,7 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
                 /*fall through*/
 
         case WDIOC_GETTIMEOUT:
-                ret = put_user(pre_margin / OSCR_FREQ, (int *)arg);
+                ret = put_user(pre_margin / OSCR_FREQ, (int __user *)arg);
                 break;
 
         case WDIOC_KEEPALIVE:
diff --git a/drivers/char/watchdog/sbc_epx_c3.c b/drivers/char/watchdog/sbc_epx_c3.c
new file mode 100644
index 000000000000..951764614ebf
--- /dev/null
+++ b/drivers/char/watchdog/sbc_epx_c3.c
@@ -0,0 +1,216 @@
+/*
+ *      SBC EPX C3 0.1  A Hardware Watchdog Device for the Winsystems EPX-C3
+ *      single board computer
+ *
+ *      (c) Copyright 2006 Calin A. Culianu <calin@ajvar.org>, All Rights
+ *      Reserved.
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      as published by the Free Software Foundation; either version
+ *      2 of the License, or (at your option) any later version.
+ *
+ *      based on softdog.c by Alan Cox <alan@redhat.com>
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/notifier.h>
+#include <linux/reboot.h>
+#include <linux/init.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
+#define PFX "epx_c3: "
+static int epx_c3_alive;
+
+#define WATCHDOG_TIMEOUT 1              /* 1 sec default timeout */
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+
+#define EPXC3_WATCHDOG_CTL_REG 0x1ee /* write 1 to enable, 0 to disable */
+#define EPXC3_WATCHDOG_PET_REG 0x1ef /* write anything to pet once enabled */
+
+static void epx_c3_start(void)
+{
+        outb(1, EPXC3_WATCHDOG_CTL_REG);
+}
+
+static void epx_c3_stop(void)
+{
+
+        outb(0, EPXC3_WATCHDOG_CTL_REG);
+
+        printk(KERN_INFO PFX "Stopped watchdog timer.\n");
+}
+
+static void epx_c3_pet(void)
+{
+        outb(1, EPXC3_WATCHDOG_PET_REG);
+}
+
+/*
+ *      Allow only one person to hold it open
+ */
+static int epx_c3_open(struct inode *inode, struct file *file)
+{
+        if (epx_c3_alive)
+                return -EBUSY;
+
+        if (nowayout)
+                __module_get(THIS_MODULE);
+
+        /* Activate timer */
+        epx_c3_start();
+        epx_c3_pet();
+
+        epx_c3_alive = 1;
+        printk(KERN_INFO "Started watchdog timer.\n");
+
+        return nonseekable_open(inode, file);
+}
+
+static int epx_c3_release(struct inode *inode, struct file *file)
+{
+        /* Shut off the timer.
+         * Lock it in if it's a module and we defined ...NOWAYOUT */
+        if (!nowayout)
+                epx_c3_stop();          /* Turn the WDT off */
+
+        epx_c3_alive = 0;
+
+        return 0;
+}
+
+static ssize_t epx_c3_write(struct file *file, const char *data,
+                        size_t len, loff_t *ppos)
+{
+        /* Refresh the timer. */
+        if (len)
+                epx_c3_pet();
+        return len;
+}
+
+static int epx_c3_ioctl(struct inode *inode, struct file *file,
+                        unsigned int cmd, unsigned long arg)
+{
+        int options, retval = -EINVAL;
+        static struct watchdog_info ident = {
+                .options                = WDIOF_KEEPALIVEPING |
+                                          WDIOF_MAGICCLOSE,
+                .firmware_version       = 0,
+                .identity               = "Winsystems EPX-C3 H/W Watchdog",
+        };
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                if (copy_to_user((struct watchdog_info *)arg,
+                                 &ident, sizeof(ident)))
+                        return -EFAULT;
+                return 0;
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                return put_user(0,(int *)arg);
+        case WDIOC_KEEPALIVE:
+                epx_c3_pet();
+                return 0;
+        case WDIOC_GETTIMEOUT:
+                return put_user(WATCHDOG_TIMEOUT,(int *)arg);
+        case WDIOC_SETOPTIONS: {
+                if (get_user(options, (int *)arg))
+                        return -EFAULT;
+
+                if (options & WDIOS_DISABLECARD) {
+                        epx_c3_stop();
+                        retval = 0;
+                }
+
+                if (options & WDIOS_ENABLECARD) {
+                        epx_c3_start();
+                        retval = 0;
+                }
+
+                return retval;
+        }
+        default:
+                return -ENOIOCTLCMD;
+        }
+}
+
+static int epx_c3_notify_sys(struct notifier_block *this, unsigned long code,
+                                void *unused)
+{
+        if (code == SYS_DOWN || code == SYS_HALT)
+                epx_c3_stop();          /* Turn the WDT off */
+
+        return NOTIFY_DONE;
+}
+
+static struct file_operations epx_c3_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .write          = epx_c3_write,
+        .ioctl          = epx_c3_ioctl,
+        .open           = epx_c3_open,
+        .release        = epx_c3_release,
+};
+
+static struct miscdevice epx_c3_miscdev = {
+        .minor          = WATCHDOG_MINOR,
+        .name           = "watchdog",
+        .fops           = &epx_c3_fops,
+};
+
+static struct notifier_block epx_c3_notifier = {
+        .notifier_call = epx_c3_notify_sys,
+};
+
+static const char banner[] __initdata =
+    KERN_INFO PFX "Hardware Watchdog Timer for Winsystems EPX-C3 SBC: 0.1\n";
+
+static int __init watchdog_init(void)
+{
+        int ret;
+
+        ret = register_reboot_notifier(&epx_c3_notifier);
+        if (ret) {
+                printk(KERN_ERR PFX "cannot register reboot notifier "
+                        "(err=%d)\n", ret);
+                return ret;
+        }
+
+        ret = misc_register(&epx_c3_miscdev);
+        if (ret) {
+                printk(KERN_ERR PFX "cannot register miscdev on minor=%d "
+                        "(err=%d)\n", WATCHDOG_MINOR, ret);
+                unregister_reboot_notifier(&epx_c3_notifier);
+                return ret;
+        }
+
+        printk(banner);
+
+        return 0;
+}
+
+static void __exit watchdog_exit(void)
+{
+        misc_deregister(&epx_c3_miscdev);
+        unregister_reboot_notifier(&epx_c3_notifier);
+}
+
+module_init(watchdog_init);
+module_exit(watchdog_exit);
+
+MODULE_AUTHOR("Calin A. Culianu <calin@ajvar.org>");
+MODULE_DESCRIPTION("Hardware Watchdog Device for Winsystems EPX-C3 SBC.  Note that there is no way to probe for this device -- so only use it if you are *sure* you are runnning on this specific SBC system from Winsystems!  It writes to IO ports 0x1ee and 0x1ef!");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);