15 files changed, 213 insertions, 327 deletions

diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index 974321a2508d..14790304b84b 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -345,7 +345,6 @@ out:
                         free_irq(apbs[i].irq, &dummy);
                 iounmap(apbs[i].RamIO);
         }
-        pci_disable_device(dev);
         return ret;
 }
 
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 244759bbd7b7..836b061ced35 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -2,7 +2,7 @@
 # Hardware Random Number Generator (RNG) configuration
 #
 
-config HW_RANDOM
+menuconfig HW_RANDOM
         tristate "Hardware Random Number Generator Core support"
         default m
         ---help---
@@ -20,9 +20,11 @@ config HW_RANDOM
 
           If unsure, say Y.
 
+if HW_RANDOM
+
 config HW_RANDOM_TIMERIOMEM
         tristate "Timer IOMEM HW Random Number Generator support"
-        depends on HW_RANDOM && HAS_IOMEM
+        depends on HAS_IOMEM
         ---help---
           This driver provides kernel-side support for a generic Random
           Number Generator used by reading a 'dumb' iomem address that
@@ -36,7 +38,7 @@ config HW_RANDOM_TIMERIOMEM
 
 config HW_RANDOM_INTEL
         tristate "Intel HW Random Number Generator support"
-        depends on HW_RANDOM && (X86 || IA64) && PCI
+        depends on (X86 || IA64) && PCI
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -49,7 +51,7 @@ config HW_RANDOM_INTEL
 
 config HW_RANDOM_AMD
         tristate "AMD HW Random Number Generator support"
-        depends on HW_RANDOM && (X86 || PPC_MAPLE) && PCI
+        depends on (X86 || PPC_MAPLE) && PCI
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -62,8 +64,8 @@ config HW_RANDOM_AMD
 
 config HW_RANDOM_ATMEL
         tristate "Atmel Random Number Generator support"
-        depends on HW_RANDOM && HAVE_CLK
-        default (HW_RANDOM && ARCH_AT91)
+        depends on ARCH_AT91 && HAVE_CLK
+        default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
           Generator hardware found on Atmel AT91 devices.
@@ -75,7 +77,7 @@ config HW_RANDOM_ATMEL
 
 config HW_RANDOM_BCM63XX
         tristate "Broadcom BCM63xx Random Number Generator support"
-        depends on HW_RANDOM && BCM63XX
+        depends on BCM63XX
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -88,7 +90,7 @@ config HW_RANDOM_BCM63XX
 
 config HW_RANDOM_BCM2835
         tristate "Broadcom BCM2835 Random Number Generator support"
-        depends on HW_RANDOM && ARCH_BCM2835
+        depends on ARCH_BCM2835
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -101,7 +103,7 @@ config HW_RANDOM_BCM2835
 
 config HW_RANDOM_GEODE
         tristate "AMD Geode HW Random Number Generator support"
-        depends on HW_RANDOM && X86_32 && PCI
+        depends on X86_32 && PCI
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -114,7 +116,7 @@ config HW_RANDOM_GEODE
 
 config HW_RANDOM_N2RNG
         tristate "Niagara2 Random Number Generator support"
-        depends on HW_RANDOM && SPARC64
+        depends on SPARC64
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -127,7 +129,7 @@ config HW_RANDOM_N2RNG
 
 config HW_RANDOM_VIA
         tristate "VIA HW Random Number Generator support"
-        depends on HW_RANDOM && X86
+        depends on X86
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -140,7 +142,7 @@ config HW_RANDOM_VIA
 
 config HW_RANDOM_IXP4XX
         tristate "Intel IXP4xx NPU HW Pseudo-Random Number Generator support"
-        depends on HW_RANDOM && ARCH_IXP4XX
+        depends on ARCH_IXP4XX
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Pseudo-Random
@@ -153,7 +155,7 @@ config HW_RANDOM_IXP4XX
 
 config HW_RANDOM_OMAP
         tristate "OMAP Random Number Generator support"
-        depends on HW_RANDOM && (ARCH_OMAP16XX || ARCH_OMAP2PLUS)
+        depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -167,7 +169,7 @@ config HW_RANDOM_OMAP
 
 config HW_RANDOM_OMAP3_ROM
         tristate "OMAP3 ROM Random Number Generator support"
-        depends on HW_RANDOM && ARCH_OMAP3
+        depends on ARCH_OMAP3
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -180,7 +182,7 @@ config HW_RANDOM_OMAP3_ROM
 
 config HW_RANDOM_OCTEON
         tristate "Octeon Random Number Generator support"
-        depends on HW_RANDOM && CAVIUM_OCTEON_SOC
+        depends on CAVIUM_OCTEON_SOC
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -193,7 +195,7 @@ config HW_RANDOM_OCTEON
 
 config HW_RANDOM_PASEMI
         tristate "PA Semi HW Random Number Generator support"
-        depends on HW_RANDOM && PPC_PASEMI
+        depends on PPC_PASEMI
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -206,7 +208,7 @@ config HW_RANDOM_PASEMI
 
 config HW_RANDOM_VIRTIO
         tristate "VirtIO Random Number Generator support"
-        depends on HW_RANDOM && VIRTIO
+        depends on VIRTIO
         ---help---
           This driver provides kernel-side support for the virtual Random Number
           Generator hardware.
@@ -216,7 +218,7 @@ config HW_RANDOM_VIRTIO
 
 config HW_RANDOM_TX4939
         tristate "TX4939 Random Number Generator support"
-        depends on HW_RANDOM && SOC_TX4939
+        depends on SOC_TX4939
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -229,7 +231,8 @@ config HW_RANDOM_TX4939
 
 config HW_RANDOM_MXC_RNGA
         tristate "Freescale i.MX RNGA Random Number Generator"
-        depends on HW_RANDOM && ARCH_HAS_RNGA
+        depends on ARCH_HAS_RNGA
+        default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
           Generator hardware found on Freescale i.MX processors.
@@ -241,7 +244,8 @@ config HW_RANDOM_MXC_RNGA
 
 config HW_RANDOM_NOMADIK
         tristate "ST-Ericsson Nomadik Random Number Generator support"
-        depends on HW_RANDOM && ARCH_NOMADIK
+        depends on ARCH_NOMADIK
+        default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
           Generator hardware found on ST-Ericsson SoCs (8815 and 8500).
@@ -251,21 +255,10 @@ config HW_RANDOM_NOMADIK
 
           If unsure, say Y.
 
-config HW_RANDOM_PICOXCELL
-        tristate "Picochip picoXcell true random number generator support"
-        depends on HW_RANDOM && ARCH_PICOXCELL && PICOXCELL_PC3X3
-        ---help---
-          This driver provides kernel-side support for the Random Number
-          Generator hardware found on Picochip PC3x3 and later devices.
-
-          To compile this driver as a module, choose M here: the
-          module will be called picoxcell-rng.
-
-          If unsure, say Y.
-
 config HW_RANDOM_PPC4XX
         tristate "PowerPC 4xx generic true random number generator support"
-        depends on HW_RANDOM && PPC && 4xx
+        depends on PPC && 4xx
+        default HW_RANDOM
         ---help---
          This driver provides the kernel-side support for the TRNG hardware
          found in the security function of some PowerPC 4xx SoCs.
@@ -275,24 +268,9 @@ config HW_RANDOM_PPC4XX
 
          If unsure, say N.
 
-config UML_RANDOM
-        depends on UML
-        tristate "Hardware random number generator"
-        help
-          This option enables UML's "hardware" random number generator.  It
-          attaches itself to the host's /dev/random, supplying as much entropy
-          as the host has, rather than the small amount the UML gets from its
-          own drivers.  It registers itself as a standard hardware random number
-          generator, major 10, minor 183, and the canonical device name is
-          /dev/hwrng.
-          The way to make use of this is to install the rng-tools package
-          (check your distro, or download from
-          http://sourceforge.net/projects/gkernel/).  rngd periodically reads
-          /dev/hwrng and injects the entropy into /dev/random.
-
 config HW_RANDOM_PSERIES
         tristate "pSeries HW Random Number Generator support"
-        depends on HW_RANDOM && PPC64 && IBMVIO
+        depends on PPC64 && IBMVIO
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -305,7 +283,7 @@ config HW_RANDOM_PSERIES
 
 config HW_RANDOM_POWERNV
         tristate "PowerNV Random Number Generator support"
-        depends on HW_RANDOM && PPC_POWERNV
+        depends on PPC_POWERNV
         default HW_RANDOM
         ---help---
           This is the driver for Random Number Generator hardware found
@@ -318,7 +296,8 @@ config HW_RANDOM_POWERNV
 
 config HW_RANDOM_EXYNOS
         tristate "EXYNOS HW random number generator support"
-        depends on HW_RANDOM && HAS_IOMEM && HAVE_CLK
+        depends on ARCH_EXYNOS
+        default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
           Generator hardware found on EXYNOS SOCs.
@@ -330,7 +309,7 @@ config HW_RANDOM_EXYNOS
 
 config HW_RANDOM_TPM
         tristate "TPM HW Random Number Generator support"
-        depends on HW_RANDOM && TCG_TPM
+        depends on TCG_TPM
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -344,6 +323,7 @@ config HW_RANDOM_TPM
 config HW_RANDOM_MSM
         tristate "Qualcomm SoCs Random Number Generator support"
         depends on HW_RANDOM && ARCH_QCOM
+        default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
           Generator hardware found on Qualcomm SoCs.
@@ -352,3 +332,20 @@ config HW_RANDOM_MSM
           module will be called msm-rng.
 
           If unsure, say Y.
+
+endif # HW_RANDOM
+
+config UML_RANDOM
+        depends on UML
+        tristate "Hardware random number generator"
+        help
+          This option enables UML's "hardware" random number generator.  It
+          attaches itself to the host's /dev/random, supplying as much entropy
+          as the host has, rather than the small amount the UML gets from its
+          own drivers.  It registers itself as a standard hardware random number
+          generator, major 10, minor 183, and the canonical device name is
+          /dev/hwrng.
+          The way to make use of this is to install the rng-tools package
+          (check your distro, or download from
+          http://sourceforge.net/projects/gkernel/).  rngd periodically reads
+          /dev/hwrng and injects the entropy into /dev/random.
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
index 3ae7755a52e7..199ed283e149 100644
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@ -22,7 +22,6 @@ obj-$(CONFIG_HW_RANDOM_TX4939) += tx4939-rng.o
 obj-$(CONFIG_HW_RANDOM_MXC_RNGA) += mxc-rnga.o
 obj-$(CONFIG_HW_RANDOM_OCTEON) += octeon-rng.o
 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
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 334601cc81cf..c4419ea1ab07 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -55,16 +55,41 @@ static DEFINE_MUTEX(rng_mutex);
 static int data_avail;
 static u8 *rng_buffer;
 
+static inline int rng_get_data(struct hwrng *rng, u8 *buffer, size_t size,
+                               int wait);
+
 static size_t rng_buffer_size(void)
 {
         return SMP_CACHE_BYTES < 32 ? 32 : SMP_CACHE_BYTES;
 }
 
+static void add_early_randomness(struct hwrng *rng)
+{
+        unsigned char bytes[16];
+        int bytes_read;
+
+        /*
+         * Currently only virtio-rng cannot return data during device
+         * probe, and that's handled in virtio-rng.c itself.  If there
+         * are more such devices, this call to rng_get_data can be
+         * made conditional here instead of doing it per-device.
+         */
+        bytes_read = rng_get_data(rng, bytes, sizeof(bytes), 1);
+        if (bytes_read > 0)
+                add_device_randomness(bytes, bytes_read);
+}
+
 static inline int hwrng_init(struct hwrng *rng)
 {
-        if (!rng->init)
-                return 0;
-        return rng->init(rng);
+        if (rng->init) {
+                int ret;
+
+                ret =  rng->init(rng);
+                if (ret)
+                        return ret;
+        }
+        add_early_randomness(rng);
+        return 0;
 }
 
 static inline void hwrng_cleanup(struct hwrng *rng)
@@ -304,8 +329,6 @@ int hwrng_register(struct hwrng *rng)
 {
         int err = -EINVAL;
         struct hwrng *old_rng, *tmp;
-        unsigned char bytes[16];
-        int bytes_read;
 
         if (rng->name == NULL ||
             (rng->data_read == NULL && rng->read == NULL))
@@ -347,9 +370,17 @@ int hwrng_register(struct hwrng *rng)
         INIT_LIST_HEAD(&rng->list);
         list_add_tail(&rng->list, &rng_list);
 
-        bytes_read = rng_get_data(rng, bytes, sizeof(bytes), 1);
-        if (bytes_read > 0)
-                add_device_randomness(bytes, bytes_read);
+        if (old_rng && !rng->init) {
+                /*
+                 * Use a new device's input to add some randomness to
+                 * the system.  If this rng device isn't going to be
+                 * used right away, its init function hasn't been
+                 * called yet; so only use the randomness from devices
+                 * that don't need an init callback.
+                 */
+                add_early_randomness(rng);
+        }
+
 out_unlock:
         mutex_unlock(&rng_mutex);
 out:
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index 432232eefe05..292a5889f675 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -632,7 +632,7 @@ static int n2rng_probe(struct platform_device *op)
         multi_capable = (match->data != NULL);
 
         n2rng_driver_version();
-        np = kzalloc(sizeof(*np), GFP_KERNEL);
+        np = devm_kzalloc(&op->dev, sizeof(*np), GFP_KERNEL);
         if (!np)
                 goto out;
         np->op = op;
@@ -653,7 +653,7 @@ static int n2rng_probe(struct platform_device *op)
                                          &np->hvapi_minor)) {
                         dev_err(&op->dev, "Cannot register suitable "
                                 "HVAPI version.\n");
-                        goto out_free;
+                        goto out;
                 }
         }
 
@@ -676,15 +676,16 @@ static int n2rng_probe(struct platform_device *op)
         dev_info(&op->dev, "Registered RNG HVAPI major %lu minor %lu\n",
                  np->hvapi_major, np->hvapi_minor);
 
-        np->units = kzalloc(sizeof(struct n2rng_unit) * np->num_units,
-                            GFP_KERNEL);
+        np->units = devm_kzalloc(&op->dev,
+                                 sizeof(struct n2rng_unit) * np->num_units,
+                                 GFP_KERNEL);
         err = -ENOMEM;
         if (!np->units)
                 goto out_hvapi_unregister;
 
         err = n2rng_init_control(np);
         if (err)
-                goto out_free_units;
+                goto out_hvapi_unregister;
 
         dev_info(&op->dev, "Found %s RNG, units: %d\n",
                  ((np->flags & N2RNG_FLAG_MULTI) ?
@@ -697,7 +698,7 @@ static int n2rng_probe(struct platform_device *op)
 
         err = hwrng_register(&np->hwrng);
         if (err)
-                goto out_free_units;
+                goto out_hvapi_unregister;
 
         platform_set_drvdata(op, np);
 
@@ -705,15 +706,9 @@ static int n2rng_probe(struct platform_device *op)
 
         return 0;
 
-out_free_units:
-        kfree(np->units);
-        np->units = NULL;
-
 out_hvapi_unregister:
         sun4v_hvapi_unregister(HV_GRP_RNG);
 
-out_free:
-        kfree(np);
 out:
         return err;
 }
@@ -730,11 +725,6 @@ static int n2rng_remove(struct platform_device *op)
 
         sun4v_hvapi_unregister(HV_GRP_RNG);
 
-        kfree(np->units);
-        np->units = NULL;
-
-        kfree(np);
-
         return 0;
 }
 
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 9b89ff4881de..f66ea258382f 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -369,10 +369,8 @@ static int omap_rng_probe(struct platform_device *pdev)
         int ret;
 
         priv = devm_kzalloc(dev, sizeof(struct omap_rng_dev), GFP_KERNEL);
-        if (!priv) {
-                dev_err(&pdev->dev, "could not allocate memory\n");
+        if (!priv)
                 return -ENOMEM;
-        };
 
         omap_rng_ops.priv = (unsigned long)priv;
         platform_set_drvdata(pdev, priv);
diff --git a/drivers/char/hw_random/picoxcell-rng.c b/drivers/char/hw_random/picoxcell-rng.c
deleted file mode 100644
index eab5448ad56f..000000000000
--- a/drivers/char/hw_random/picoxcell-rng.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2010-2011 Picochip Ltd., Jamie Iles
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * All enquiries to support@picochip.com
- */
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/hw_random.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-
-#define DATA_REG_OFFSET         0x0200
-#define CSR_REG_OFFSET          0x0278
-#define CSR_OUT_EMPTY_MASK      (1 << 24)
-#define CSR_FAULT_MASK          (1 << 1)
-#define TRNG_BLOCK_RESET_MASK   (1 << 0)
-#define TAI_REG_OFFSET          0x0380
-
-/*
- * The maximum amount of time in microseconds to spend waiting for data if the
- * core wants us to wait.  The TRNG should generate 32 bits every 320ns so a
- * timeout of 20us seems reasonable.  The TRNG does builtin tests of the data
- * for randomness so we can't always assume there is data present.
- */
-#define PICO_TRNG_TIMEOUT               20
-
-static void __iomem *rng_base;
-static struct clk *rng_clk;
-static struct device *rng_dev;
-
-static inline u32 picoxcell_trng_read_csr(void)
-{
-        return __raw_readl(rng_base + CSR_REG_OFFSET);
-}
-
-static inline bool picoxcell_trng_is_empty(void)
-{
-        return picoxcell_trng_read_csr() & CSR_OUT_EMPTY_MASK;
-}
-
-/*
- * Take the random number generator out of reset and make sure the interrupts
- * are masked. We shouldn't need to get large amounts of random bytes so just
- * poll the status register. The hardware generates 32 bits every 320ns so we
- * shouldn't have to wait long enough to warrant waiting for an IRQ.
- */
-static void picoxcell_trng_start(void)
-{
-        __raw_writel(0, rng_base + TAI_REG_OFFSET);
-        __raw_writel(0, rng_base + CSR_REG_OFFSET);
-}
-
-static void picoxcell_trng_reset(void)
-{
-        __raw_writel(TRNG_BLOCK_RESET_MASK, rng_base + CSR_REG_OFFSET);
-        __raw_writel(TRNG_BLOCK_RESET_MASK, rng_base + TAI_REG_OFFSET);
-        picoxcell_trng_start();
-}
-
-/*
- * Get some random data from the random number generator. The hw_random core
- * layer provides us with locking.
- */
-static int picoxcell_trng_read(struct hwrng *rng, void *buf, size_t max,
-                               bool wait)
-{
-        int i;
-
-        /* Wait for some data to become available. */
-        for (i = 0; i < PICO_TRNG_TIMEOUT && picoxcell_trng_is_empty(); ++i) {
-                if (!wait)
-                        return 0;
-
-                udelay(1);
-        }
-
-        if (picoxcell_trng_read_csr() & CSR_FAULT_MASK) {
-                dev_err(rng_dev, "fault detected, resetting TRNG\n");
-                picoxcell_trng_reset();
-                return -EIO;
-        }
-
-        if (i == PICO_TRNG_TIMEOUT)
-                return 0;
-
-        *(u32 *)buf = __raw_readl(rng_base + DATA_REG_OFFSET);
-        return sizeof(u32);
-}
-
-static struct hwrng picoxcell_trng = {
-        .name           = "picoxcell",
-        .read           = picoxcell_trng_read,
-};
-
-static int picoxcell_trng_probe(struct platform_device *pdev)
-{
-        int ret;
-        struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-        rng_base = devm_ioremap_resource(&pdev->dev, mem);
-        if (IS_ERR(rng_base))
-                return PTR_ERR(rng_base);
-
-        rng_clk = devm_clk_get(&pdev->dev, NULL);
-        if (IS_ERR(rng_clk)) {
-                dev_warn(&pdev->dev, "no clk\n");
-                return PTR_ERR(rng_clk);
-        }
-
-        ret = clk_enable(rng_clk);
-        if (ret) {
-                dev_warn(&pdev->dev, "unable to enable clk\n");
-                return ret;
-        }
-
-        picoxcell_trng_start();
-        ret = hwrng_register(&picoxcell_trng);
-        if (ret)
-                goto err_register;
-
-        rng_dev = &pdev->dev;
-        dev_info(&pdev->dev, "pixoxcell random number generator active\n");
-
-        return 0;
-
-err_register:
-        clk_disable(rng_clk);
-        return ret;
-}
-
-static int picoxcell_trng_remove(struct platform_device *pdev)
-{
-        hwrng_unregister(&picoxcell_trng);
-        clk_disable(rng_clk);
-
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int picoxcell_trng_suspend(struct device *dev)
-{
-        clk_disable(rng_clk);
-
-        return 0;
-}
-
-static int picoxcell_trng_resume(struct device *dev)
-{
-        return clk_enable(rng_clk);
-}
-
-static const struct dev_pm_ops picoxcell_trng_pm_ops = {
-        .suspend        = picoxcell_trng_suspend,
-        .resume         = picoxcell_trng_resume,
-};
-#endif /* CONFIG_PM */
-
-static struct platform_driver picoxcell_trng_driver = {
-        .probe          = picoxcell_trng_probe,
-        .remove         = picoxcell_trng_remove,
-        .driver         = {
-                .name   = "picoxcell-trng",
-                .owner  = THIS_MODULE,
-#ifdef CONFIG_PM
-                .pm     = &picoxcell_trng_pm_ops,
-#endif /* CONFIG_PM */
-        },
-};
-
-module_platform_driver(picoxcell_trng_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jamie Iles");
-MODULE_DESCRIPTION("Picochip picoXcell TRNG driver");
diff --git a/drivers/char/hw_random/timeriomem-rng.c b/drivers/char/hw_random/timeriomem-rng.c
index 439ff8b28c43..b6ab9ac3f34d 100644
--- a/drivers/char/hw_random/timeriomem-rng.c
+++ b/drivers/char/hw_random/timeriomem-rng.c
@@ -120,10 +120,8 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
         /* Allocate memory for the device structure (and zero it) */
         priv = devm_kzalloc(&pdev->dev,
                         sizeof(struct timeriomem_rng_private_data), GFP_KERNEL);
-        if (!priv) {
-                dev_err(&pdev->dev, "failed to allocate device structure.\n");
+        if (!priv)
                 return -ENOMEM;
-        }
 
         platform_set_drvdata(pdev, priv);
 
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index 2ce0e225e58c..e9b15bc18b4d 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -25,101 +25,140 @@
 #include <linux/virtio_rng.h>
 #include <linux/module.h>
 
-static struct virtqueue *vq;
-static unsigned int data_avail;
-static DECLARE_COMPLETION(have_data);
-static bool busy;
+static DEFINE_IDA(rng_index_ida);
+
+struct virtrng_info {
+        struct virtio_device *vdev;
+        struct hwrng hwrng;
+        struct virtqueue *vq;
+        unsigned int data_avail;
+        struct completion have_data;
+        bool busy;
+        char name[25];
+        int index;
+};
+
+static bool probe_done;
 
 static void random_recv_done(struct virtqueue *vq)
 {
+        struct virtrng_info *vi = vq->vdev->priv;
+
         /* We can get spurious callbacks, e.g. shared IRQs + virtio_pci. */
-        if (!virtqueue_get_buf(vq, &data_avail))
+        if (!virtqueue_get_buf(vi->vq, &vi->data_avail))
                 return;
 
-        complete(&have_data);
+        complete(&vi->have_data);
 }
 
 /* The host will fill any buffer we give it with sweet, sweet randomness. */
-static void register_buffer(u8 *buf, size_t size)
+static void register_buffer(struct virtrng_info *vi, u8 *buf, size_t size)
 {
         struct scatterlist sg;
 
         sg_init_one(&sg, buf, size);
 
         /* There should always be room for one buffer. */
-        virtqueue_add_inbuf(vq, &sg, 1, buf, GFP_KERNEL);
+        virtqueue_add_inbuf(vi->vq, &sg, 1, buf, GFP_KERNEL);
 
-        virtqueue_kick(vq);
+        virtqueue_kick(vi->vq);
 }
 
 static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
 {
         int ret;
+        struct virtrng_info *vi = (struct virtrng_info *)rng->priv;
 
-        if (!busy) {
-                busy = true;
-                init_completion(&have_data);
-                register_buffer(buf, size);
+        /*
+         * Don't ask host for data till we're setup.  This call can
+         * happen during hwrng_register(), after commit d9e7972619.
+         */
+        if (unlikely(!probe_done))
+                return 0;
+
+        if (!vi->busy) {
+                vi->busy = true;
+                init_completion(&vi->have_data);
+                register_buffer(vi, buf, size);
         }
 
         if (!wait)
                 return 0;
 
-        ret = wait_for_completion_killable(&have_data);
+        ret = wait_for_completion_killable(&vi->have_data);
         if (ret < 0)
                 return ret;
 
-        busy = false;
+        vi->busy = false;
 
-        return data_avail;
+        return vi->data_avail;
 }
 
 static void virtio_cleanup(struct hwrng *rng)
 {
-        if (busy)
-                wait_for_completion(&have_data);
-}
+        struct virtrng_info *vi = (struct virtrng_info *)rng->priv;
 
-
-static struct hwrng virtio_hwrng = {
-        .name           = "virtio",
-        .cleanup        = virtio_cleanup,
-        .read           = virtio_read,
-};
+        if (vi->busy)
+                wait_for_completion(&vi->have_data);
+}
 
 static int probe_common(struct virtio_device *vdev)
 {
-        int err;
+        int err, index;
+        struct virtrng_info *vi = NULL;
 
-        if (vq) {
-                /* We only support one device for now */
-                return -EBUSY;
+        vi = kzalloc(sizeof(struct virtrng_info), GFP_KERNEL);
+        if (!vi)
+                return -ENOMEM;
+
+        vi->index = index = ida_simple_get(&rng_index_ida, 0, 0, GFP_KERNEL);
+        if (index < 0) {
+                kfree(vi);
+                return index;
         }
+        sprintf(vi->name, "virtio_rng.%d", index);
+        init_completion(&vi->have_data);
+
+        vi->hwrng = (struct hwrng) {
+                .read = virtio_read,
+                .cleanup = virtio_cleanup,
+                .priv = (unsigned long)vi,
+                .name = vi->name,
+        };
+        vdev->priv = vi;
+
         /* We expect a single virtqueue. */
-        vq = virtio_find_single_vq(vdev, random_recv_done, "input");
-        if (IS_ERR(vq)) {
-                err = PTR_ERR(vq);
-                vq = NULL;
+        vi->vq = virtio_find_single_vq(vdev, random_recv_done, "input");
+        if (IS_ERR(vi->vq)) {
+                err = PTR_ERR(vi->vq);
+                vi->vq = NULL;
+                kfree(vi);
+                ida_simple_remove(&rng_index_ida, index);
                 return err;
         }
 
-        err = hwrng_register(&virtio_hwrng);
+        err = hwrng_register(&vi->hwrng);
         if (err) {
                 vdev->config->del_vqs(vdev);
-                vq = NULL;
+                vi->vq = NULL;
+                kfree(vi);
+                ida_simple_remove(&rng_index_ida, index);
                 return err;
         }
 
+        probe_done = true;
         return 0;
 }
 
 static void remove_common(struct virtio_device *vdev)
 {
+        struct virtrng_info *vi = vdev->priv;
         vdev->config->reset(vdev);
-        busy = false;
-        hwrng_unregister(&virtio_hwrng);
+        vi->busy = false;
+        hwrng_unregister(&vi->hwrng);
         vdev->config->del_vqs(vdev);
-        vq = NULL;
+        ida_simple_remove(&rng_index_ida, vi->index);
+        kfree(vi);
 }
 
 static int virtrng_probe(struct virtio_device *vdev)
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index d915707d2ba1..93dcad0c1cbe 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -138,7 +138,9 @@ static int i8k_smm(struct smm_regs *regs)
         if (!alloc_cpumask_var(&old_mask, GFP_KERNEL))
                 return -ENOMEM;
         cpumask_copy(old_mask, &current->cpus_allowed);
-        set_cpus_allowed_ptr(current, cpumask_of(0));
+        rc = set_cpus_allowed_ptr(current, cpumask_of(0));
+        if (rc)
+                goto out;
         if (smp_processor_id() != 0) {
                 rc = -EBUSY;
                 goto out;
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 1c4bb4f6ce93..5d665680ae33 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1007,7 +1007,7 @@ static int ipmi_thread(void *data)
         struct timespec busy_until;
 
         ipmi_si_set_not_busy(&busy_until);
-        set_user_nice(current, 19);
+        set_user_nice(current, MAX_NICE);
         while (!kthread_should_stop()) {
                 int busy_wait;
 
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 6b75713d953a..71529e196b84 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -641,7 +641,7 @@ retry:
                 } while (unlikely(entropy_count < pool_size-2 && pnfrac));
         }
 
-        if (entropy_count < 0) {
+        if (unlikely(entropy_count < 0)) {
                 pr_warn("random: negative entropy/overflow: pool %s count %d\n",
                         r->name, entropy_count);
                 WARN_ON(1);
@@ -902,6 +902,7 @@ void add_disk_randomness(struct gendisk *disk)
         add_timer_randomness(disk->random, 0x100 + disk_devt(disk));
         trace_add_disk_randomness(disk_devt(disk), ENTROPY_BITS(&input_pool));
 }
+EXPORT_SYMBOL_GPL(add_disk_randomness);
 #endif
 
 /*********************************************************************
@@ -979,24 +980,38 @@ static void push_to_pool(struct work_struct *work)
 static size_t account(struct entropy_store *r, size_t nbytes, int min,
                       int reserved)
 {
-        int have_bytes;
         int entropy_count, orig;
-        size_t ibytes;
+        size_t ibytes, nfrac;
 
         BUG_ON(r->entropy_count > r->poolinfo->poolfracbits);
 
         /* Can we pull enough? */
 retry:
         entropy_count = orig = ACCESS_ONCE(r->entropy_count);
-        have_bytes = entropy_count >> (ENTROPY_SHIFT + 3);
         ibytes = nbytes;
         /* If limited, never pull more than available */
-        if (r->limit)
-                ibytes = min_t(size_t, ibytes, have_bytes - reserved);
+        if (r->limit) {
+                int have_bytes = entropy_count >> (ENTROPY_SHIFT + 3);
+
+                if ((have_bytes -= reserved) < 0)
+                        have_bytes = 0;
+                ibytes = min_t(size_t, ibytes, have_bytes);
+        }
         if (ibytes < min)
                 ibytes = 0;
-        entropy_count = max_t(int, 0,
-                              entropy_count - (ibytes << (ENTROPY_SHIFT + 3)));
+
+        if (unlikely(entropy_count < 0)) {
+                pr_warn("random: negative entropy count: pool %s count %d\n",
+                        r->name, entropy_count);
+                WARN_ON(1);
+                entropy_count = 0;
+        }
+        nfrac = ibytes << (ENTROPY_SHIFT + 3);
+        if ((size_t) entropy_count > nfrac)
+                entropy_count -= nfrac;
+        else
+                entropy_count = 0;
+
         if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)
                 goto retry;
 
@@ -1371,6 +1386,7 @@ urandom_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
                             "with %d bits of entropy available\n",
                             current->comm, nonblocking_pool.entropy_total);
 
+        nbytes = min_t(size_t, nbytes, INT_MAX >> (ENTROPY_SHIFT + 3));
         ret = extract_entropy_user(&nonblocking_pool, buf, nbytes);
 
         trace_urandom_read(8 * nbytes, ENTROPY_BITS(&nonblocking_pool),
@@ -1578,10 +1594,10 @@ static int proc_do_uuid(struct ctl_table *table, int write,
 /*
  * Return entropy available scaled to integral bits
  */
-static int proc_do_entropy(ctl_table *table, int write,
+static int proc_do_entropy(struct ctl_table *table, int write,
                            void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-        ctl_table fake_table;
+        struct ctl_table fake_table;
         int entropy_count;
 
         entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 6e8d65e9b1d3..0102dc788608 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -284,10 +284,10 @@ static long raw_ctl_compat_ioctl(struct file *file, unsigned int cmd,
 #endif
 
 static const struct file_operations raw_fops = {
-        .read           = do_sync_read,
-        .aio_read       = generic_file_aio_read,
-        .write          = do_sync_write,
-        .aio_write      = blkdev_aio_write,
+        .read           = new_sync_read,
+        .read_iter      = generic_file_read_iter,
+        .write          = new_sync_write,
+        .write_iter     = blkdev_write_iter,
         .fsync          = blkdev_fsync,
         .open           = raw_open,
         .release        = raw_release,
diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
index b9a57fa4b710..565a9478cb94 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -95,7 +95,7 @@ int read_log(struct tpm_bios_log *log)
 
         log->bios_event_log_end = log->bios_event_log + len;
 
-        virt = acpi_os_map_memory(start, len);
+        virt = acpi_os_map_iomem(start, len);
         if (!virt) {
                 kfree(log->bios_event_log);
                 printk("%s: ERROR - Unable to map memory\n", __func__);
@@ -104,6 +104,6 @@ int read_log(struct tpm_bios_log *log)
 
         memcpy_fromio(log->bios_event_log, virt, len);
 
-        acpi_os_unmap_memory(virt, len);
+        acpi_os_unmap_iomem(virt, len);
         return 0;
 }
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c
index b3ea223585bd..61dcc8011ec7 100644
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@ -328,13 +328,11 @@ int tpm_add_ppi(struct kobject *parent)
         /* Cache TPM ACPI handle and version string */
         acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
                             ppi_callback, NULL, NULL, &tpm_ppi_handle);
-        if (tpm_ppi_handle == NULL)
-                return -ENODEV;
-
-        return sysfs_create_group(parent, &ppi_attr_grp);
+        return tpm_ppi_handle ? sysfs_create_group(parent, &ppi_attr_grp) : 0;
 }
 
 void tpm_remove_ppi(struct kobject *parent)
 {
-        sysfs_remove_group(parent, &ppi_attr_grp);
+        if (tpm_ppi_handle)
+                sysfs_remove_group(parent, &ppi_attr_grp);
 }