13 files changed, 119 insertions, 22 deletions

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 448ce5e29c56..dca5834685cf 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -486,8 +486,7 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
                 }
 
                 sprintf(devp->hd_name, "hpet%d", (int)(devp - hpetp->hp_dev));
-                irq_flags = devp->hd_flags & HPET_SHARED_IRQ
-                                                ? IRQF_SHARED : IRQF_DISABLED;
+                irq_flags = devp->hd_flags & HPET_SHARED_IRQ ? IRQF_SHARED : 0;
                 if (request_irq(irq, hpet_interrupt, irq_flags,
                                 devp->hd_name, (void *)devp)) {
                         printk(KERN_ERR "hpet: IRQ %d is not free\n", irq);
@@ -971,8 +970,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                 struct acpi_resource_fixed_memory32 *fixmem32;
 
                 fixmem32 = &res->data.fixed_memory32;
-                if (!fixmem32)
-                        return AE_NO_MEMORY;
 
                 hdp->hd_phys_address = fixmem32->address;
                 hdp->hd_address = ioremap(fixmem32->address,
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 0aa9d91daef5..c206de2951f2 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -290,6 +290,19 @@ config HW_RANDOM_PSERIES
 
           If unsure, say Y.
 
+config HW_RANDOM_POWERNV
+        tristate "PowerNV Random Number Generator support"
+        depends on HW_RANDOM && PPC_POWERNV
+        default HW_RANDOM
+        ---help---
+          This is the driver for Random Number Generator hardware found
+          in POWER7+ and above machines for PowerNV platform.
+
+          To compile this driver as a module, choose M here: the
+          module will be called powernv-rng.
+
+          If unsure, say Y.
+
 config HW_RANDOM_EXYNOS
         tristate "EXYNOS HW random number generator support"
         depends on HW_RANDOM && HAS_IOMEM && HAVE_CLK
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
index bed467c9300e..d7d2435ff7fa 100644
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_HW_RANDOM_NOMADIK) += nomadik-rng.o
 obj-$(CONFIG_HW_RANDOM_PICOXCELL) += picoxcell-rng.o
 obj-$(CONFIG_HW_RANDOM_PPC4XX) += ppc4xx-rng.o
 obj-$(CONFIG_HW_RANDOM_PSERIES) += pseries-rng.o
+obj-$(CONFIG_HW_RANDOM_POWERNV) += powernv-rng.o
 obj-$(CONFIG_HW_RANDOM_EXYNOS)  += exynos-rng.o
 obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o
 obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o
diff --git a/drivers/char/hw_random/powernv-rng.c b/drivers/char/hw_random/powernv-rng.c
new file mode 100644
index 000000000000..3f4f63204560
--- /dev/null
+++ b/drivers/char/hw_random/powernv-rng.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013 Michael Ellerman, Guo Chao, IBM Corp.
+ *
+ * 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.
+ */
+
+#define pr_fmt(fmt)     KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/random.h>
+#include <linux/hw_random.h>
+
+static int powernv_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
+{
+        unsigned long *buf;
+        int i, len;
+
+        /* We rely on rng_buffer_size() being >= sizeof(unsigned long) */
+        len = max / sizeof(unsigned long);
+
+        buf = (unsigned long *)data;
+
+        for (i = 0; i < len; i++)
+                powernv_get_random_long(buf++);
+
+        return len * sizeof(unsigned long);
+}
+
+static struct hwrng powernv_hwrng = {
+        .name = "powernv-rng",
+        .read = powernv_rng_read,
+};
+
+static int powernv_rng_remove(struct platform_device *pdev)
+{
+        hwrng_unregister(&powernv_hwrng);
+
+        return 0;
+}
+
+static int powernv_rng_probe(struct platform_device *pdev)
+{
+        int rc;
+
+        rc = hwrng_register(&powernv_hwrng);
+        if (rc) {
+                /* We only register one device, ignore any others */
+                if (rc == -EEXIST)
+                        rc = -ENODEV;
+
+                return rc;
+        }
+
+        pr_info("Registered powernv hwrng.\n");
+
+        return 0;
+}
+
+static struct of_device_id powernv_rng_match[] = {
+        { .compatible   = "ibm,power-rng",},
+        {},
+};
+MODULE_DEVICE_TABLE(of, powernv_rng_match);
+
+static struct platform_driver powernv_rng_driver = {
+        .driver = {
+                .name = "powernv_rng",
+                .of_match_table = powernv_rng_match,
+        },
+        .probe  = powernv_rng_probe,
+        .remove = powernv_rng_remove,
+};
+module_platform_driver(powernv_rng_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Bare metal HWRNG driver for POWER7+ and above");
diff --git a/drivers/char/hw_random/pseries-rng.c b/drivers/char/hw_random/pseries-rng.c
index 5f1197929f0c..b761459a3436 100644
--- a/drivers/char/hw_random/pseries-rng.c
+++ b/drivers/char/hw_random/pseries-rng.c
@@ -17,6 +17,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/hw_random.h>
 #include <asm/vio.h>
@@ -25,10 +28,15 @@
 
 static int pseries_rng_data_read(struct hwrng *rng, u32 *data)
 {
-        if (plpar_hcall(H_RANDOM, (unsigned long *)data) != H_SUCCESS) {
-                printk(KERN_ERR "pseries rng hcall error\n");
-                return 0;
+        int rc;
+
+        rc = plpar_hcall(H_RANDOM, (unsigned long *)data);
+        if (rc != H_SUCCESS) {
+                pr_err_ratelimited("H_RANDOM call failed %d\n", rc);
+                return -EIO;
         }
+
+        /* The hypervisor interface returns 64 bits */
         return 8;
 }
 
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 190d4423653f..2f685f6eda48 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -193,8 +193,8 @@ int misc_register(struct miscdevice * misc)
         if (misc->minor == MISC_DYNAMIC_MINOR) {
                 int i = find_first_zero_bit(misc_minors, DYNAMIC_MINORS);
                 if (i >= DYNAMIC_MINORS) {
-                        mutex_unlock(&misc_mtx);
-                        return -EBUSY;
+                        err = -EBUSY;
+                        goto out;
                 }
                 misc->minor = DYNAMIC_MINORS - i - 1;
                 set_bit(i, misc_minors);
@@ -203,8 +203,8 @@ int misc_register(struct miscdevice * misc)
 
                 list_for_each_entry(c, &misc_list, list) {
                         if (c->minor == misc->minor) {
-                                mutex_unlock(&misc_mtx);
-                                return -EBUSY;
+                                err = -EBUSY;
+                                goto out;
                         }
                 }
         }
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index cfdfe493c6af..1fd00dc06897 100644
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -220,7 +220,7 @@ static int __init nwbutton_init(void)
                 return -EBUSY;
         }
 
-        if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, IRQF_DISABLED,
+        if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, 0,
                         "nwbutton", NULL)) {
                 printk (KERN_WARNING "nwbutton: IRQ %d is not free.\n",
                                 IRQ_NETWINDER_BUTTON);
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index c0cbbd429bdc..35259961cc38 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -227,7 +227,7 @@ static inline unsigned char rtc_is_updating(void)
 
 #ifdef RTC_IRQ
 /*
- *      A very tiny interrupt handler. It runs with IRQF_DISABLED set,
+ *      A very tiny interrupt handler. It runs with interrupts disabled,
  *      but there is possibility of conflicting with the set_rtc_mmss()
  *      call (the rtc irq and the timer irq can easily run at the same
  *      time in two different CPUs). So we need to serialize
@@ -1040,8 +1040,7 @@ no_irq:
                 rtc_int_handler_ptr = rtc_interrupt;
         }
 
-        if (request_irq(RTC_IRQ, rtc_int_handler_ptr, IRQF_DISABLED,
-                        "rtc", NULL)) {
+        if (request_irq(RTC_IRQ, rtc_int_handler_ptr, 0, "rtc", NULL)) {
                 /* Yeah right, seeing as irq 8 doesn't even hit the bus. */
                 rtc_has_irq = 0;
                 printk(KERN_ERR "rtc: IRQ %d is not free.\n", RTC_IRQ);
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index 5816b39ff5a9..8bab59292a0d 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -108,8 +108,7 @@ scdrv_open(struct inode *inode, struct file *file)
         /* hook this subchannel up to the system controller interrupt */
         mutex_lock(&scdrv_mutex);
         rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt,
-                         IRQF_SHARED | IRQF_DISABLED,
-                         SYSCTL_BASENAME, sd);
+                         IRQF_SHARED, SYSCTL_BASENAME, sd);
         if (rv) {
                 ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch);
                 kfree(sd);
diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c
index ee156948b9f8..59bcefd6ec7c 100644
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
@@ -292,8 +292,7 @@ scdrv_event_init(struct sysctl_data_s *scd)
 
         /* hook event subchannel up to the system controller interrupt */
         rv = request_irq(SGI_UART_VECTOR, scdrv_event_interrupt,
-                         IRQF_SHARED | IRQF_DISABLED,
-                         "system controller events", event_sd);
+                         IRQF_SHARED, "system controller events", event_sd);
         if (rv) {
                 printk(KERN_WARNING "%s: irq request failed (%d)\n",
                        __func__, rv);
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index e95e0ab0bd87..100cd1de9939 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -222,7 +222,7 @@ static int tlclk_open(struct inode *inode, struct file *filp)
         /* This device is wired through the FPGA IO space of the ATCA blade
          * we can't share this IRQ */
         result = request_irq(telclk_interrupt, &tlclk_interrupt,
-                             IRQF_DISABLED, "telco_clock", tlclk_interrupt);
+                             0, "telco_clock", tlclk_interrupt);
         if (result == -EBUSY)
                 printk(KERN_ERR "tlclk: Interrupt can't be reserved.\n");
         else
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index 06189e55b4e5..94c280d36e8b 100644
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
+#include <xen/xen.h>
 #include <xen/events.h>
 #include <xen/interface/io/tpmif.h>
 #include <xen/grant_table.h>
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 5224da5202d3..f6345f932e46 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -721,7 +721,7 @@ static int hwicap_remove(struct device *dev)
 {
         struct hwicap_drvdata *drvdata;
 
-        drvdata = (struct hwicap_drvdata *)dev_get_drvdata(dev);
+        drvdata = dev_get_drvdata(dev);
 
         if (!drvdata)
                 return 0;
@@ -731,7 +731,6 @@ static int hwicap_remove(struct device *dev)
         iounmap(drvdata->base_address);
         release_mem_region(drvdata->mem_start, drvdata->mem_size);
         kfree(drvdata);
-        dev_set_drvdata(dev, NULL);
 
         mutex_lock(&icap_sem);
         probed_devices[MINOR(dev->devt)-XHWICAP_MINOR] = 0;