8 files changed, 64 insertions, 292 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d4a7776f4b77..0f175a866ef0 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -1047,15 +1047,6 @@ config NSC_GPIO
           pc8736x_gpio drivers.  If those drivers are built as
           modules, this one will be too, named nsc_gpio
 
-config CS5535_GPIO
-        tristate "AMD CS5535/CS5536 GPIO (Geode Companion Device)"
-        depends on X86_32
-        help
-          Give userspace access to the GPIO pins on the AMD CS5535 and
-          CS5536 Geode companion devices.
-
-          If compiled as a module, it will be called cs5535_gpio.
-
 config RAW_DRIVER
         tristate "RAW driver (/dev/raw/rawN)"
         depends on BLOCK
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index fa0b824b7a65..1e9dffb33778 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -82,7 +82,6 @@ obj-$(CONFIG_NWFLASH)		+= nwflash.o
 obj-$(CONFIG_SCx200_GPIO)       += scx200_gpio.o
 obj-$(CONFIG_PC8736x_GPIO)      += pc8736x_gpio.o
 obj-$(CONFIG_NSC_GPIO)          += nsc_gpio.o
-obj-$(CONFIG_CS5535_GPIO)       += cs5535_gpio.o
 obj-$(CONFIG_GPIO_TB0219)       += tb0219.o
 obj-$(CONFIG_TELCLOCK)          += tlclk.o
 
diff --git a/drivers/char/cs5535_gpio.c b/drivers/char/cs5535_gpio.c
deleted file mode 100644
index 0cf1e5fad9ab..000000000000
--- a/drivers/char/cs5535_gpio.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * AMD CS5535/CS5536 GPIO driver.
- * Allows a user space process to play with the GPIO pins.
- *
- * Copyright (c) 2005 Ben Gardner <bgardner@wabtec.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the smems of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- */
-
-#include <linux/fs.h>
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/cdev.h>
-#include <linux/ioport.h>
-#include <linux/pci.h>
-
-#include <asm/uaccess.h>
-#include <asm/io.h>
-
-
-#define NAME                    "cs5535_gpio"
-
-MODULE_AUTHOR("Ben Gardner <bgardner@wabtec.com>");
-MODULE_DESCRIPTION("AMD CS5535/CS5536 GPIO Pin Driver");
-MODULE_LICENSE("GPL");
-
-static int major;
-module_param(major, int, 0);
-MODULE_PARM_DESC(major, "Major device number");
-
-static ulong mask;
-module_param(mask, ulong, 0);
-MODULE_PARM_DESC(mask, "GPIO channel mask");
-
-#define MSR_LBAR_GPIO           0x5140000C
-
-static u32 gpio_base;
-
-static struct pci_device_id divil_pci[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_NS,  PCI_DEVICE_ID_NS_CS5535_ISA) },
-        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
-        { } /* NULL entry */
-};
-MODULE_DEVICE_TABLE(pci, divil_pci);
-
-static struct cdev cs5535_gpio_cdev;
-
-/* reserve 32 entries even though some aren't usable */
-#define CS5535_GPIO_COUNT       32
-
-/* IO block size */
-#define CS5535_GPIO_SIZE        256
-
-struct gpio_regmap {
-        u32     rd_offset;
-        u32     wr_offset;
-        char    on;
-        char    off;
-};
-static struct gpio_regmap rm[] =
-{
-        { 0x30, 0x00, '1', '0' },       /* GPIOx_READ_BACK / GPIOx_OUT_VAL */
-        { 0x20, 0x20, 'I', 'i' },       /* GPIOx_IN_EN */
-        { 0x04, 0x04, 'O', 'o' },       /* GPIOx_OUT_EN */
-        { 0x08, 0x08, 't', 'T' },       /* GPIOx_OUT_OD_EN */
-        { 0x18, 0x18, 'P', 'p' },       /* GPIOx_OUT_PU_EN */
-        { 0x1c, 0x1c, 'D', 'd' },       /* GPIOx_OUT_PD_EN */
-};
-
-
-/**
- * Gets the register offset for the GPIO bank.
- * Low (0-15) starts at 0x00, high (16-31) starts at 0x80
- */
-static inline u32 cs5535_lowhigh_base(int reg)
-{
-        return (reg & 0x10) << 3;
-}
-
-static ssize_t cs5535_gpio_write(struct file *file, const char __user *data,
-                                 size_t len, loff_t *ppos)
-{
-        u32     m = iminor(file->f_path.dentry->d_inode);
-        int     i, j;
-        u32     base = gpio_base + cs5535_lowhigh_base(m);
-        u32     m0, m1;
-        char    c;
-
-        /**
-         * Creates the mask for atomic bit programming.
-         * The high 16 bits and the low 16 bits are used to set the mask.
-         * For example, GPIO 15 maps to 31,15: 0,1 => On; 1,0=> Off
-         */
-        m1 = 1 << (m & 0x0F);
-        m0 = m1 << 16;
-
-        for (i = 0; i < len; ++i) {
-                if (get_user(c, data+i))
-                        return -EFAULT;
-
-                for (j = 0; j < ARRAY_SIZE(rm); j++) {
-                        if (c == rm[j].on) {
-                                outl(m1, base + rm[j].wr_offset);
-                                /* If enabling output, turn off AUX 1 and AUX 2 */
-                                if (c == 'O') {
-                                        outl(m0, base + 0x10);
-                                        outl(m0, base + 0x14);
-                                }
-                                break;
-                        } else if (c == rm[j].off) {
-                                outl(m0, base + rm[j].wr_offset);
-                                break;
-                        }
-                }
-        }
-        *ppos = 0;
-        return len;
-}
-
-static ssize_t cs5535_gpio_read(struct file *file, char __user *buf,
-                                size_t len, loff_t *ppos)
-{
-        u32     m = iminor(file->f_path.dentry->d_inode);
-        u32     base = gpio_base + cs5535_lowhigh_base(m);
-        int     rd_bit = 1 << (m & 0x0f);
-        int     i;
-        char    ch;
-        ssize_t count = 0;
-
-        if (*ppos >= ARRAY_SIZE(rm))
-                return 0;
-
-        for (i = *ppos; (i < (*ppos + len)) && (i < ARRAY_SIZE(rm)); i++) {
-                ch = (inl(base + rm[i].rd_offset) & rd_bit) ?
-                     rm[i].on : rm[i].off;
-
-                if (put_user(ch, buf+count))
-                        return -EFAULT;
-
-                count++;
-        }
-
-        /* add a line-feed if there is room */
-        if ((i == ARRAY_SIZE(rm)) && (count < len)) {
-                put_user('\n', buf + count);
-                count++;
-        }
-
-        *ppos += count;
-        return count;
-}
-
-static int cs5535_gpio_open(struct inode *inode, struct file *file)
-{
-        u32 m = iminor(inode);
-
-        /* the mask says which pins are usable by this driver */
-        if ((mask & (1 << m)) == 0)
-                return -EINVAL;
-
-        return nonseekable_open(inode, file);
-}
-
-static const struct file_operations cs5535_gpio_fops = {
-        .owner  = THIS_MODULE,
-        .write  = cs5535_gpio_write,
-        .read   = cs5535_gpio_read,
-        .open   = cs5535_gpio_open,
-        .llseek = no_llseek,
-};
-
-static int __init cs5535_gpio_init(void)
-{
-        dev_t   dev_id;
-        u32     low, hi;
-        int     retval;
-
-        if (pci_dev_present(divil_pci) == 0) {
-                printk(KERN_WARNING NAME ": DIVIL not found\n");
-                return -ENODEV;
-        }
-
-        /* Grab the GPIO I/O range */
-        rdmsr(MSR_LBAR_GPIO, low, hi);
-
-        /* Check the mask and whether GPIO is enabled (sanity check) */
-        if (hi != 0x0000f001) {
-                printk(KERN_WARNING NAME ": GPIO not enabled\n");
-                return -ENODEV;
-        }
-
-        /* Mask off the IO base address */
-        gpio_base = low & 0x0000ff00;
-
-        /**
-         * Some GPIO pins
-         *  31-29,23 : reserved (always mask out)
-         *  28       : Power Button
-         *  26       : PME#
-         *  22-16    : LPC
-         *  14,15    : SMBus
-         *  9,8      : UART1
-         *  7        : PCI INTB
-         *  3,4      : UART2/DDC
-         *  2        : IDE_IRQ0
-         *  0        : PCI INTA
-         *
-         * If a mask was not specified, be conservative and only allow:
-         *  1,2,5,6,10-13,24,25,27
-         */
-        if (mask != 0)
-                mask &= 0x1f7fffff;
-        else
-                mask = 0x0b003c66;
-
-        if (!request_region(gpio_base, CS5535_GPIO_SIZE, NAME)) {
-                printk(KERN_ERR NAME ": can't allocate I/O for GPIO\n");
-                return -ENODEV;
-        }
-
-        if (major) {
-                dev_id = MKDEV(major, 0);
-                retval = register_chrdev_region(dev_id, CS5535_GPIO_COUNT,
-                                                NAME);
-        } else {
-                retval = alloc_chrdev_region(&dev_id, 0, CS5535_GPIO_COUNT,
-                                             NAME);
-                major = MAJOR(dev_id);
-        }
-
-        if (retval) {
-                release_region(gpio_base, CS5535_GPIO_SIZE);
-                return -1;
-        }
-
-        printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
-               gpio_base, mask, major);
-
-        cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
-        cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-
-        return 0;
-}
-
-static void __exit cs5535_gpio_cleanup(void)
-{
-        dev_t dev_id = MKDEV(major, 0);
-
-        cdev_del(&cs5535_gpio_cdev);
-        unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-        release_region(gpio_base, CS5535_GPIO_SIZE);
-}
-
-module_init(cs5535_gpio_init);
-module_exit(cs5535_gpio_cleanup);
diff --git a/drivers/char/hw_random/via-rng.c b/drivers/char/hw_random/via-rng.c
index 794aacb715c1..d0387a84eec1 100644
--- a/drivers/char/hw_random/via-rng.c
+++ b/drivers/char/hw_random/via-rng.c
@@ -24,6 +24,7 @@
  * warranty of any kind, whether express or implied.
  */
 
+#include <crypto/padlock.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/hw_random.h>
@@ -34,7 +35,6 @@
 #include <asm/i387.h>
 
 
-#define PFX     KBUILD_MODNAME ": "
 
 
 enum {
@@ -81,8 +81,7 @@ static inline u32 xstore(u32 *addr, u32 edx_in)
         ts_state = irq_ts_save();
 
         asm(".byte 0x0F,0xA7,0xC0 /* xstore %%edi (addr=%0) */"
-                :"=m"(*addr), "=a"(eax_out)
-                :"D"(addr), "d"(edx_in));
+                : "=m" (*addr), "=a" (eax_out), "+d" (edx_in), "+D" (addr));
 
         irq_ts_restore(ts_state);
         return eax_out;
@@ -90,8 +89,10 @@ static inline u32 xstore(u32 *addr, u32 edx_in)
 
 static int via_rng_data_present(struct hwrng *rng, int wait)
 {
+        char buf[16 + PADLOCK_ALIGNMENT - STACK_ALIGN] __attribute__
+                ((aligned(STACK_ALIGN)));
+        u32 *via_rng_datum = (u32 *)PTR_ALIGN(&buf[0], PADLOCK_ALIGNMENT);
         u32 bytes_out;
-        u32 *via_rng_datum = (u32 *)(&rng->priv);
         int i;
 
         /* We choose the recommended 1-byte-per-instruction RNG rate,
@@ -115,6 +116,7 @@ static int via_rng_data_present(struct hwrng *rng, int wait)
                         break;
                 udelay(10);
         }
+        rng->priv = *via_rng_datum;
         return bytes_out ? 1 : 0;
 }
 
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 2fe72f8edf44..38223e93aa98 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -970,6 +970,33 @@ out_kfree:
 }
 EXPORT_SYMBOL(ipmi_create_user);
 
+int ipmi_get_smi_info(int if_num, struct ipmi_smi_info *data)
+{
+        int           rv = 0;
+        ipmi_smi_t    intf;
+        struct ipmi_smi_handlers *handlers;
+
+        mutex_lock(&ipmi_interfaces_mutex);
+        list_for_each_entry_rcu(intf, &ipmi_interfaces, link) {
+                if (intf->intf_num == if_num)
+                        goto found;
+        }
+        /* Not found, return an error */
+        rv = -EINVAL;
+        mutex_unlock(&ipmi_interfaces_mutex);
+        return rv;
+
+found:
+        handlers = intf->handlers;
+        rv = -ENOSYS;
+        if (handlers->get_smi_info)
+                rv = handlers->get_smi_info(intf->send_info, data);
+        mutex_unlock(&ipmi_interfaces_mutex);
+
+        return rv;
+}
+EXPORT_SYMBOL(ipmi_get_smi_info);
+
 static void free_user(struct kref *ref)
 {
         ipmi_user_t user = container_of(ref, struct ipmi_user, refcount);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index f27c04e18aaa..b6ae6e9a9c5f 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -57,6 +57,7 @@
 #include <asm/irq.h>
 #include <linux/interrupt.h>
 #include <linux/rcupdate.h>
+#include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
 #include <asm/io.h>
 #include "ipmi_si_sm.h"
@@ -109,10 +110,6 @@ enum si_type {
 };
 static char *si_to_str[] = { "kcs", "smic", "bt" };
 
-enum ipmi_addr_src {
-        SI_INVALID = 0, SI_HOTMOD, SI_HARDCODED, SI_SPMI, SI_ACPI, SI_SMBIOS,
-        SI_PCI, SI_DEVICETREE, SI_DEFAULT
-};
 static char *ipmi_addr_src_to_str[] = { NULL, "hotmod", "hardcoded", "SPMI",
                                         "ACPI", "SMBIOS", "PCI",
                                         "device-tree", "default" };
@@ -293,6 +290,7 @@ struct smi_info {
         struct task_struct *thread;
 
         struct list_head link;
+        union ipmi_smi_info_union addr_info;
 };
 
 #define smi_inc_stat(smi, stat) \
@@ -1188,6 +1186,18 @@ static int smi_start_processing(void       *send_info,
         return 0;
 }
 
+static int get_smi_info(void *send_info, struct ipmi_smi_info *data)
+{
+        struct smi_info *smi = send_info;
+
+        data->addr_src = smi->addr_source;
+        data->dev = smi->dev;
+        data->addr_info = smi->addr_info;
+        get_device(smi->dev);
+
+        return 0;
+}
+
 static void set_maintenance_mode(void *send_info, int enable)
 {
         struct smi_info   *smi_info = send_info;
@@ -1199,6 +1209,7 @@ static void set_maintenance_mode(void *send_info, int enable)
 static struct ipmi_smi_handlers handlers = {
         .owner                  = THIS_MODULE,
         .start_processing       = smi_start_processing,
+        .get_smi_info           = get_smi_info,
         .sender                 = sender,
         .request_events         = request_events,
         .set_maintenance_mode   = set_maintenance_mode,
@@ -1930,7 +1941,8 @@ static void __devinit hardcode_find_bmc(void)
 static int acpi_failure;
 
 /* For GPE-type interrupts. */
-static u32 ipmi_acpi_gpe(void *context)
+static u32 ipmi_acpi_gpe(acpi_handle gpe_device,
+        u32 gpe_number, void *context)
 {
         struct smi_info *smi_info = context;
         unsigned long   flags;
@@ -2158,6 +2170,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
         printk(KERN_INFO PFX "probing via ACPI\n");
 
         handle = acpi_dev->handle;
+        info->addr_info.acpi_info.acpi_handle = handle;
 
         /* _IFT tells us the interface type: KCS, BT, etc */
         status = acpi_evaluate_integer(handle, "_IFT", NULL, &tmp);
diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c
index d3d63be2cd37..1a9f5f6d6ac5 100644
--- a/drivers/char/ramoops.c
+++ b/drivers/char/ramoops.c
@@ -30,7 +30,7 @@
 
 #define RAMOOPS_KERNMSG_HDR "===="
 
-#define RECORD_SIZE 4096
+#define RECORD_SIZE 4096UL
 
 static ulong mem_address;
 module_param(mem_address, ulong, 0400);
@@ -68,11 +68,16 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper,
         char *buf, *buf_orig;
         struct timeval timestamp;
 
+        if (reason != KMSG_DUMP_OOPS &&
+            reason != KMSG_DUMP_PANIC &&
+            reason != KMSG_DUMP_KEXEC)
+                return;
+
         /* Only dump oopses if dump_oops is set */
         if (reason == KMSG_DUMP_OOPS && !dump_oops)
                 return;
 
-        buf = (char *)(cxt->virt_addr + (cxt->count * RECORD_SIZE));
+        buf = cxt->virt_addr + (cxt->count * RECORD_SIZE);
         buf_orig = buf;
 
         memset(buf, '\0', RECORD_SIZE);
@@ -83,8 +88,8 @@ static void ramoops_do_dump(struct kmsg_dumper *dumper,
         buf += res;
 
         hdr_size = buf - buf_orig;
-        l2_cpy = min(l2, (unsigned long)(RECORD_SIZE - hdr_size));
-        l1_cpy = min(l1, (unsigned long)(RECORD_SIZE - hdr_size) - l2_cpy);
+        l2_cpy = min(l2, RECORD_SIZE - hdr_size);
+        l1_cpy = min(l1, RECORD_SIZE - hdr_size - l2_cpy);
 
         s2_start = l2 - l2_cpy;
         s1_start = l1 - l1_cpy;
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index bfe25ea9766b..b4b9d5a47885 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -65,15 +65,12 @@ static int raw_open(struct inode *inode, struct file *filp)
         if (!bdev)
                 goto out;
         igrab(bdev->bd_inode);
-        err = blkdev_get(bdev, filp->f_mode);
+        err = blkdev_get(bdev, filp->f_mode | FMODE_EXCL, raw_open);
         if (err)
                 goto out;
-        err = bd_claim(bdev, raw_open);
-        if (err)
-                goto out1;
         err = set_blocksize(bdev, bdev_logical_block_size(bdev));
         if (err)
-                goto out2;
+                goto out1;
         filp->f_flags |= O_DIRECT;
         filp->f_mapping = bdev->bd_inode->i_mapping;
         if (++raw_devices[minor].inuse == 1)
@@ -83,10 +80,8 @@ static int raw_open(struct inode *inode, struct file *filp)
         mutex_unlock(&raw_mutex);
         return 0;
 
-out2:
-        bd_release(bdev);
 out1:
-        blkdev_put(bdev, filp->f_mode);
+        blkdev_put(bdev, filp->f_mode | FMODE_EXCL);
 out:
         mutex_unlock(&raw_mutex);
         return err;
@@ -110,8 +105,7 @@ static int raw_release(struct inode *inode, struct file *filp)
         }
         mutex_unlock(&raw_mutex);
 
-        bd_release(bdev);
-        blkdev_put(bdev, filp->f_mode);
+        blkdev_put(bdev, filp->f_mode | FMODE_EXCL);
         return 0;
 }