Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:
 "Here is the crypto update for 4.1:

  New interfaces:
   - user-space interface for AEAD
   - user-space interface for RNG (i.e., pseudo RNG)

  New hashes:
   - ARMv8 SHA1/256
   - ARMv8 AES
   - ARMv8 GHASH
   - ARM assembler and NEON SHA256
   - MIPS OCTEON SHA1/256/512
   - MIPS img-hash SHA1/256 and MD5
   - Power 8 VMX AES/CBC/CTR/GHASH
   - PPC assembler AES, SHA1/256 and MD5
   - Broadcom IPROC RNG driver

  Cleanups/fixes:
   - prevent internal helper algos from being exposed to user-space
   - merge common code from assembly/C SHA implementations
   - misc fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (169 commits)
  crypto: arm - workaround for building with old binutils
  crypto: arm/sha256 - avoid sha256 code on ARMv7-M
  crypto: x86/sha512_ssse3 - move SHA-384/512 SSSE3 implementation to base layer
  crypto: x86/sha256_ssse3 - move SHA-224/256 SSSE3 implementation to base layer
  crypto: x86/sha1_ssse3 - move SHA-1 SSSE3 implementation to base layer
  crypto: arm64/sha2-ce - move SHA-224/256 ARMv8 implementation to base layer
  crypto: arm64/sha1-ce - move SHA-1 ARMv8 implementation to base layer
  crypto: arm/sha2-ce - move SHA-224/256 ARMv8 implementation to base layer
  crypto: arm/sha256 - move SHA-224/256 ASM/NEON implementation to base layer
  crypto: arm/sha1-ce - move SHA-1 ARMv8 implementation to base layer
  crypto: arm/sha1_neon - move SHA-1 NEON implementation to base layer
  crypto: arm/sha1 - move SHA-1 ARM asm implementation to base layer
  crypto: sha512-generic - move to generic glue implementation
  crypto: sha256-generic - move to generic glue implementation
  crypto: sha1-generic - move to generic glue implementation
  crypto: sha512 - implement base layer for SHA-512
  crypto: sha256 - implement base layer for SHA-256
  crypto: sha1 - implement base layer for SHA-1
  crypto: api - remove instance when test failed
  crypto: api - Move alg ref count init to crypto_check_alg
  ...

11 files changed, 367 insertions, 115 deletions

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index de57b38809c7..f48cf11c655e 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -101,6 +101,19 @@ config HW_RANDOM_BCM2835
 
           If unsure, say Y.
 
+config HW_RANDOM_IPROC_RNG200
+        tristate "Broadcom iProc RNG200 support"
+        depends on ARCH_BCM_IPROC
+        default HW_RANDOM
+        ---help---
+          This driver provides kernel-side support for the RNG200
+          hardware found on the Broadcom iProc SoCs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called iproc-rng200
+
+          If unsure, say Y.
+
 config HW_RANDOM_GEODE
         tristate "AMD Geode HW Random Number Generator support"
         depends on X86_32 && PCI
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
index 0b4cd57f4e24..055bb01510ad 100644
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@ -28,5 +28,6 @@ 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
+obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o
 obj-$(CONFIG_HW_RANDOM_MSM) += msm-rng.o
 obj-$(CONFIG_HW_RANDOM_XGENE) += xgene-rng.o
diff --git a/drivers/char/hw_random/bcm63xx-rng.c b/drivers/char/hw_random/bcm63xx-rng.c
index ba6a65ac023b..d1494ecd9e11 100644
--- a/drivers/char/hw_random/bcm63xx-rng.c
+++ b/drivers/char/hw_random/bcm63xx-rng.c
@@ -13,24 +13,37 @@
 #include <linux/platform_device.h>
 #include <linux/hw_random.h>
 
-#include <bcm63xx_io.h>
-#include <bcm63xx_regs.h>
+#define RNG_CTRL                        0x00
+#define RNG_EN                          (1 << 0)
+
+#define RNG_STAT                        0x04
+#define RNG_AVAIL_MASK                  (0xff000000)
+
+#define RNG_DATA                        0x08
+#define RNG_THRES                       0x0c
+#define RNG_MASK                        0x10
 
 struct bcm63xx_rng_priv {
+        struct hwrng rng;
         struct clk *clk;
         void __iomem *regs;
 };
 
-#define to_rng_priv(rng)        ((struct bcm63xx_rng_priv *)rng->priv)
+#define to_rng_priv(rng)        container_of(rng, struct bcm63xx_rng_priv, rng)
 
 static int bcm63xx_rng_init(struct hwrng *rng)
 {
         struct bcm63xx_rng_priv *priv = to_rng_priv(rng);
         u32 val;
+        int error;
+
+        error = clk_prepare_enable(priv->clk);
+        if (error)
+                return error;
 
-        val = bcm_readl(priv->regs + RNG_CTRL);
+        val = __raw_readl(priv->regs + RNG_CTRL);
         val |= RNG_EN;
-        bcm_writel(val, priv->regs + RNG_CTRL);
+        __raw_writel(val, priv->regs + RNG_CTRL);
 
         return 0;
 }
@@ -40,23 +53,25 @@ static void bcm63xx_rng_cleanup(struct hwrng *rng)
         struct bcm63xx_rng_priv *priv = to_rng_priv(rng);
         u32 val;
 
-        val = bcm_readl(priv->regs + RNG_CTRL);
+        val = __raw_readl(priv->regs + RNG_CTRL);
         val &= ~RNG_EN;
-        bcm_writel(val, priv->regs + RNG_CTRL);
+        __raw_writel(val, priv->regs + RNG_CTRL);
+
+        clk_didsable_unprepare(prov->clk);
 }
 
 static int bcm63xx_rng_data_present(struct hwrng *rng, int wait)
 {
         struct bcm63xx_rng_priv *priv = to_rng_priv(rng);
 
-        return bcm_readl(priv->regs + RNG_STAT) & RNG_AVAIL_MASK;
+        return __raw_readl(priv->regs + RNG_STAT) & RNG_AVAIL_MASK;
 }
 
 static int bcm63xx_rng_data_read(struct hwrng *rng, u32 *data)
 {
         struct bcm63xx_rng_priv *priv = to_rng_priv(rng);
 
-        *data = bcm_readl(priv->regs + RNG_DATA);
+        *data = __raw_readl(priv->regs + RNG_DATA);
 
         return 4;
 }
@@ -72,94 +87,53 @@ static int bcm63xx_rng_probe(struct platform_device *pdev)
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!r) {
                 dev_err(&pdev->dev, "no iomem resource\n");
-                ret = -ENXIO;
-                goto out;
+                return -ENXIO;
         }
 
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv) {
-                dev_err(&pdev->dev, "no memory for private structure\n");
-                ret = -ENOMEM;
-                goto out;
+        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->rng.name = pdev->name;
+        priv->rng.init = bcm63xx_rng_init;
+        priv->rng.cleanup = bcm63xx_rng_cleanup;
+        prov->rng.data_present = bcm63xx_rng_data_present;
+        priv->rng.data_read = bcm63xx_rng_data_read;
+
+        priv->clk = devm_clk_get(&pdev->dev, "ipsec");
+        if (IS_ERR(priv->clk)) {
+                error = PTR_ERR(priv->clk);
+                dev_err(&pdev->dev, "no clock for device: %d\n", error);
+                return error;
         }
 
-        rng = kzalloc(sizeof(*rng), GFP_KERNEL);
-        if (!rng) {
-                dev_err(&pdev->dev, "no memory for rng structure\n");
-                ret = -ENOMEM;
-                goto out_free_priv;
-        }
-
-        platform_set_drvdata(pdev, rng);
-        rng->priv = (unsigned long)priv;
-        rng->name = pdev->name;
-        rng->init = bcm63xx_rng_init;
-        rng->cleanup = bcm63xx_rng_cleanup;
-        rng->data_present = bcm63xx_rng_data_present;
-        rng->data_read = bcm63xx_rng_data_read;
-
-        clk = clk_get(&pdev->dev, "ipsec");
-        if (IS_ERR(clk)) {
-                dev_err(&pdev->dev, "no clock for device\n");
-                ret = PTR_ERR(clk);
-                goto out_free_rng;
-        }
-
-        priv->clk = clk;
-
         if (!devm_request_mem_region(&pdev->dev, r->start,
                                         resource_size(r), pdev->name)) {
                 dev_err(&pdev->dev, "request mem failed");
-                ret = -ENOMEM;
-                goto out_free_rng;
+                return -EBUSY;
         }
 
         priv->regs = devm_ioremap_nocache(&pdev->dev, r->start,
                                         resource_size(r));
         if (!priv->regs) {
                 dev_err(&pdev->dev, "ioremap failed");
-                ret = -ENOMEM;
-                goto out_free_rng;
+                return -ENOMEM;
         }
 
-        clk_enable(clk);
-
-        ret = hwrng_register(rng);
-        if (ret) {
-                dev_err(&pdev->dev, "failed to register rng device\n");
-                goto out_clk_disable;
+        error = devm_hwrng_register(&pdev->dev, &priv->rng);
+        if (error) {
+                dev_err(&pdev->dev, "failed to register rng device: %d\n",
+                        error);
+                return error;
         }
 
         dev_info(&pdev->dev, "registered RNG driver\n");
 
         return 0;
-
-out_clk_disable:
-        clk_disable(clk);
-out_free_rng:
-        kfree(rng);
-out_free_priv:
-        kfree(priv);
-out:
-        return ret;
-}
-
-static int bcm63xx_rng_remove(struct platform_device *pdev)
-{
-        struct hwrng *rng = platform_get_drvdata(pdev);
-        struct bcm63xx_rng_priv *priv = to_rng_priv(rng);
-
-        hwrng_unregister(rng);
-        clk_disable(priv->clk);
-        kfree(priv);
-        kfree(rng);
-
-        return 0;
 }
 
 static struct platform_driver bcm63xx_rng_driver = {
         .probe          = bcm63xx_rng_probe,
-        .remove         = bcm63xx_rng_remove,
         .driver         = {
                 .name   = "bcm63xx-rng",
         },
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 32a8a867f7f8..571ef61f8ea9 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -179,7 +179,8 @@ skip_init:
         add_early_randomness(rng);
 
         current_quality = rng->quality ? : default_quality;
-        current_quality &= 1023;
+        if (current_quality > 1024)
+                current_quality = 1024;
 
         if (current_quality == 0 && hwrng_fill)
                 kthread_stop(hwrng_fill);
@@ -536,6 +537,48 @@ void hwrng_unregister(struct hwrng *rng)
 }
 EXPORT_SYMBOL_GPL(hwrng_unregister);
 
+static void devm_hwrng_release(struct device *dev, void *res)
+{
+        hwrng_unregister(*(struct hwrng **)res);
+}
+
+static int devm_hwrng_match(struct device *dev, void *res, void *data)
+{
+        struct hwrng **r = res;
+
+        if (WARN_ON(!r || !*r))
+                return 0;
+
+        return *r == data;
+}
+
+int devm_hwrng_register(struct device *dev, struct hwrng *rng)
+{
+        struct hwrng **ptr;
+        int error;
+
+        ptr = devres_alloc(devm_hwrng_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return -ENOMEM;
+
+        error = hwrng_register(rng);
+        if (error) {
+                devres_free(ptr);
+                return error;
+        }
+
+        *ptr = rng;
+        devres_add(dev, ptr);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(devm_hwrng_register);
+
+void devm_hwrng_unregister(struct device *dev, struct hwrng *rng)
+{
+        devres_release(dev, devm_hwrng_release, devm_hwrng_match, rng);
+}
+EXPORT_SYMBOL_GPL(devm_hwrng_unregister);
+
 static int __init hwrng_modinit(void)
 {
         return register_miscdev();
diff --git a/drivers/char/hw_random/exynos-rng.c b/drivers/char/hw_random/exynos-rng.c
index fed0830bf724..dc4701fd814f 100644
--- a/drivers/char/hw_random/exynos-rng.c
+++ b/drivers/char/hw_random/exynos-rng.c
@@ -131,16 +131,7 @@ static int exynos_rng_probe(struct platform_device *pdev)
         pm_runtime_use_autosuspend(&pdev->dev);
         pm_runtime_enable(&pdev->dev);
 
-        return hwrng_register(&exynos_rng->rng);
-}
-
-static int exynos_rng_remove(struct platform_device *pdev)
-{
-        struct exynos_rng *exynos_rng = platform_get_drvdata(pdev);
-
-        hwrng_unregister(&exynos_rng->rng);
-
-        return 0;
+        return devm_hwrng_register(&pdev->dev, &exynos_rng->rng);
 }
 
 #ifdef CONFIG_PM
@@ -172,7 +163,6 @@ static struct platform_driver exynos_rng_driver = {
                 .pm     = &exynos_rng_pm_ops,
         },
         .probe          = exynos_rng_probe,
-        .remove         = exynos_rng_remove,
 };
 
 module_platform_driver(exynos_rng_driver);
diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c
new file mode 100644
index 000000000000..3eaf7cb96d36
--- /dev/null
+++ b/drivers/char/hw_random/iproc-rng200.c
@@ -0,0 +1,239 @@
+/*
+* Copyright (C) 2015 Broadcom Corporation
+*
+* 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 version 2.
+*
+* This program is distributed "as is" WITHOUT ANY WARRANTY of any
+* kind, whether express or implied; without even the implied warranty
+* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*/
+/*
+ * DESCRIPTION: The Broadcom iProc RNG200 Driver
+ */
+
+#include <linux/hw_random.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+
+/* Registers */
+#define RNG_CTRL_OFFSET                                 0x00
+#define RNG_CTRL_RNG_RBGEN_MASK                         0x00001FFF
+#define RNG_CTRL_RNG_RBGEN_ENABLE                       0x00000001
+#define RNG_CTRL_RNG_RBGEN_DISABLE                      0x00000000
+
+#define RNG_SOFT_RESET_OFFSET                           0x04
+#define RNG_SOFT_RESET                                  0x00000001
+
+#define RBG_SOFT_RESET_OFFSET                           0x08
+#define RBG_SOFT_RESET                                  0x00000001
+
+#define RNG_INT_STATUS_OFFSET                           0x18
+#define RNG_INT_STATUS_MASTER_FAIL_LOCKOUT_IRQ_MASK     0x80000000
+#define RNG_INT_STATUS_STARTUP_TRANSITIONS_MET_IRQ_MASK 0x00020000
+#define RNG_INT_STATUS_NIST_FAIL_IRQ_MASK               0x00000020
+#define RNG_INT_STATUS_TOTAL_BITS_COUNT_IRQ_MASK        0x00000001
+
+#define RNG_FIFO_DATA_OFFSET                            0x20
+
+#define RNG_FIFO_COUNT_OFFSET                           0x24
+#define RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK              0x000000FF
+
+struct iproc_rng200_dev {
+        struct hwrng rng;
+        void __iomem *base;
+};
+
+#define to_rng_priv(rng)        container_of(rng, struct iproc_rng200_dev, rng)
+
+static void iproc_rng200_restart(void __iomem *rng_base)
+{
+        uint32_t val;
+
+        /* Disable RBG */
+        val = ioread32(rng_base + RNG_CTRL_OFFSET);
+        val &= ~RNG_CTRL_RNG_RBGEN_MASK;
+        val |= RNG_CTRL_RNG_RBGEN_DISABLE;
+        iowrite32(val, rng_base + RNG_CTRL_OFFSET);
+
+        /* Clear all interrupt status */
+        iowrite32(0xFFFFFFFFUL, rng_base + RNG_INT_STATUS_OFFSET);
+
+        /* Reset RNG and RBG */
+        val = ioread32(rng_base + RBG_SOFT_RESET_OFFSET);
+        val |= RBG_SOFT_RESET;
+        iowrite32(val, rng_base + RBG_SOFT_RESET_OFFSET);
+
+        val = ioread32(rng_base + RNG_SOFT_RESET_OFFSET);
+        val |= RNG_SOFT_RESET;
+        iowrite32(val, rng_base + RNG_SOFT_RESET_OFFSET);
+
+        val = ioread32(rng_base + RNG_SOFT_RESET_OFFSET);
+        val &= ~RNG_SOFT_RESET;
+        iowrite32(val, rng_base + RNG_SOFT_RESET_OFFSET);
+
+        val = ioread32(rng_base + RBG_SOFT_RESET_OFFSET);
+        val &= ~RBG_SOFT_RESET;
+        iowrite32(val, rng_base + RBG_SOFT_RESET_OFFSET);
+
+        /* Enable RBG */
+        val = ioread32(rng_base + RNG_CTRL_OFFSET);
+        val &= ~RNG_CTRL_RNG_RBGEN_MASK;
+        val |= RNG_CTRL_RNG_RBGEN_ENABLE;
+        iowrite32(val, rng_base + RNG_CTRL_OFFSET);
+}
+
+static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max,
+                             bool wait)
+{
+        struct iproc_rng200_dev *priv = to_rng_priv(rng);
+        uint32_t num_remaining = max;
+        uint32_t status;
+
+        #define MAX_RESETS_PER_READ     1
+        uint32_t num_resets = 0;
+
+        #define MAX_IDLE_TIME   (1 * HZ)
+        unsigned long idle_endtime = jiffies + MAX_IDLE_TIME;
+
+        while ((num_remaining > 0) && time_before(jiffies, idle_endtime)) {
+
+                /* Is RNG sane? If not, reset it. */
+                status = ioread32(priv->base + RNG_INT_STATUS_OFFSET);
+                if ((status & (RNG_INT_STATUS_MASTER_FAIL_LOCKOUT_IRQ_MASK |
+                        RNG_INT_STATUS_NIST_FAIL_IRQ_MASK)) != 0) {
+
+                        if (num_resets >= MAX_RESETS_PER_READ)
+                                return max - num_remaining;
+
+                        iproc_rng200_restart(priv->base);
+                        num_resets++;
+                }
+
+                /* Are there any random numbers available? */
+                if ((ioread32(priv->base + RNG_FIFO_COUNT_OFFSET) &
+                                RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK) > 0) {
+
+                        if (num_remaining >= sizeof(uint32_t)) {
+                                /* Buffer has room to store entire word */
+                                *(uint32_t *)buf = ioread32(priv->base +
+                                                        RNG_FIFO_DATA_OFFSET);
+                                buf += sizeof(uint32_t);
+                                num_remaining -= sizeof(uint32_t);
+                        } else {
+                                /* Buffer can only store partial word */
+                                uint32_t rnd_number = ioread32(priv->base +
+                                                        RNG_FIFO_DATA_OFFSET);
+                                memcpy(buf, &rnd_number, num_remaining);
+                                buf += num_remaining;
+                                num_remaining = 0;
+                        }
+
+                        /* Reset the IDLE timeout */
+                        idle_endtime = jiffies + MAX_IDLE_TIME;
+                } else {
+                        if (!wait)
+                                /* Cannot wait, return immediately */
+                                return max - num_remaining;
+
+                        /* Can wait, give others chance to run */
+                        usleep_range(min(num_remaining * 10, 500U), 500);
+                }
+        }
+
+        return max - num_remaining;
+}
+
+static int iproc_rng200_init(struct hwrng *rng)
+{
+        struct iproc_rng200_dev *priv = to_rng_priv(rng);
+        uint32_t val;
+
+        /* Setup RNG. */
+        val = ioread32(priv->base + RNG_CTRL_OFFSET);
+        val &= ~RNG_CTRL_RNG_RBGEN_MASK;
+        val |= RNG_CTRL_RNG_RBGEN_ENABLE;
+        iowrite32(val, priv->base + RNG_CTRL_OFFSET);
+
+        return 0;
+}
+
+static void iproc_rng200_cleanup(struct hwrng *rng)
+{
+        struct iproc_rng200_dev *priv = to_rng_priv(rng);
+        uint32_t val;
+
+        /* Disable RNG hardware */
+        val = ioread32(priv->base + RNG_CTRL_OFFSET);
+        val &= ~RNG_CTRL_RNG_RBGEN_MASK;
+        val |= RNG_CTRL_RNG_RBGEN_DISABLE;
+        iowrite32(val, priv->base + RNG_CTRL_OFFSET);
+}
+
+static int iproc_rng200_probe(struct platform_device *pdev)
+{
+        struct iproc_rng200_dev *priv;
+        struct resource *res;
+        struct device *dev = &pdev->dev;
+        int ret;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        /* Map peripheral */
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(dev, "failed to get rng resources\n");
+                return -EINVAL;
+        }
+
+        priv->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(priv->base)) {
+                dev_err(dev, "failed to remap rng regs\n");
+                return PTR_ERR(priv->base);
+        }
+
+        priv->rng.name = "iproc-rng200",
+        priv->rng.read = iproc_rng200_read,
+        priv->rng.init = iproc_rng200_init,
+        priv->rng.cleanup = iproc_rng200_cleanup,
+
+        /* Register driver */
+        ret = devm_hwrng_register(dev, &priv->rng);
+        if (ret) {
+                dev_err(dev, "hwrng registration failed\n");
+                return ret;
+        }
+
+        dev_info(dev, "hwrng registered\n");
+
+        return 0;
+}
+
+static const struct of_device_id iproc_rng200_of_match[] = {
+        { .compatible = "brcm,iproc-rng200", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, iproc_rng200_of_match);
+
+static struct platform_driver iproc_rng200_driver = {
+        .driver = {
+                .name           = "iproc-rng200",
+                .of_match_table = iproc_rng200_of_match,
+        },
+        .probe          = iproc_rng200_probe,
+};
+module_platform_driver(iproc_rng200_driver);
+
+MODULE_AUTHOR("Broadcom");
+MODULE_DESCRIPTION("iProc RNG200 Random Number Generator driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/char/hw_random/msm-rng.c b/drivers/char/hw_random/msm-rng.c
index cea1c703d62f..96fb986402eb 100644
--- a/drivers/char/hw_random/msm-rng.c
+++ b/drivers/char/hw_random/msm-rng.c
@@ -157,7 +157,7 @@ static int msm_rng_probe(struct platform_device *pdev)
         rng->hwrng.cleanup = msm_rng_cleanup,
         rng->hwrng.read = msm_rng_read,
 
-        ret = hwrng_register(&rng->hwrng);
+        ret = devm_hwrng_register(&pdev->dev, &rng->hwrng);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register hwrng\n");
                 return ret;
@@ -166,14 +166,6 @@ static int msm_rng_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int msm_rng_remove(struct platform_device *pdev)
-{
-        struct msm_rng *rng = platform_get_drvdata(pdev);
-
-        hwrng_unregister(&rng->hwrng);
-        return 0;
-}
-
 static const struct of_device_id msm_rng_of_match[] = {
         { .compatible = "qcom,prng", },
         {}
@@ -182,7 +174,6 @@ MODULE_DEVICE_TABLE(of, msm_rng_of_match);
 
 static struct platform_driver msm_rng_driver = {
         .probe = msm_rng_probe,
-        .remove = msm_rng_remove,
         .driver = {
                 .name = KBUILD_MODNAME,
                 .of_match_table = of_match_ptr(msm_rng_of_match),
diff --git a/drivers/char/hw_random/octeon-rng.c b/drivers/char/hw_random/octeon-rng.c
index be1c3f607398..6234a4a19b56 100644
--- a/drivers/char/hw_random/octeon-rng.c
+++ b/drivers/char/hw_random/octeon-rng.c
@@ -105,7 +105,7 @@ static int octeon_rng_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __exit octeon_rng_remove(struct platform_device *pdev)
+static int octeon_rng_remove(struct platform_device *pdev)
 {
         struct hwrng *rng = platform_get_drvdata(pdev);
 
@@ -119,7 +119,7 @@ static struct platform_driver octeon_rng_driver = {
                 .name           = "octeon_rng",
         },
         .probe          = octeon_rng_probe,
-        .remove         = __exit_p(octeon_rng_remove),
+        .remove         = octeon_rng_remove,
 };
 
 module_platform_driver(octeon_rng_driver);
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index d14dcf788f17..8a1432e8bb80 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -236,7 +236,7 @@ static int omap4_rng_init(struct omap_rng_dev *priv)
         u32 val;
 
         /* Return if RNG is already running. */
-        if (omap_rng_read(priv, RNG_CONFIG_REG) & RNG_CONTROL_ENABLE_TRNG_MASK)
+        if (omap_rng_read(priv, RNG_CONTROL_REG) & RNG_CONTROL_ENABLE_TRNG_MASK)
                 return 0;
 
         val = RNG_CONFIG_MIN_REFIL_CYCLES << RNG_CONFIG_MIN_REFIL_CYCLES_SHIFT;
@@ -262,7 +262,7 @@ static void omap4_rng_cleanup(struct omap_rng_dev *priv)
 
         val = omap_rng_read(priv, RNG_CONTROL_REG);
         val &= ~RNG_CONTROL_ENABLE_TRNG_MASK;
-        omap_rng_write(priv, RNG_CONFIG_REG, val);
+        omap_rng_write(priv, RNG_CONTROL_REG, val);
 }
 
 static irqreturn_t omap4_rng_irq(int irq, void *dev_id)
@@ -408,7 +408,7 @@ err_ioremap:
         return ret;
 }
 
-static int __exit omap_rng_remove(struct platform_device *pdev)
+static int omap_rng_remove(struct platform_device *pdev)
 {
         struct omap_rng_dev *priv = platform_get_drvdata(pdev);
 
@@ -422,9 +422,7 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-
-static int omap_rng_suspend(struct device *dev)
+static int __maybe_unused omap_rng_suspend(struct device *dev)
 {
         struct omap_rng_dev *priv = dev_get_drvdata(dev);
 
@@ -434,7 +432,7 @@ static int omap_rng_suspend(struct device *dev)
         return 0;
 }
 
-static int omap_rng_resume(struct device *dev)
+static int __maybe_unused omap_rng_resume(struct device *dev)
 {
         struct omap_rng_dev *priv = dev_get_drvdata(dev);
 
@@ -445,22 +443,15 @@ static int omap_rng_resume(struct device *dev)
 }
 
 static SIMPLE_DEV_PM_OPS(omap_rng_pm, omap_rng_suspend, omap_rng_resume);
-#define OMAP_RNG_PM     (&omap_rng_pm)
-
-#else
-
-#define OMAP_RNG_PM     NULL
-
-#endif
 
 static struct platform_driver omap_rng_driver = {
         .driver = {
                 .name           = "omap_rng",
-                .pm             = OMAP_RNG_PM,
+                .pm             = &omap_rng_pm,
                 .of_match_table = of_match_ptr(omap_rng_of_match),
         },
         .probe          = omap_rng_probe,
-        .remove         = __exit_p(omap_rng_remove),
+        .remove         = omap_rng_remove,
 };
 
 module_platform_driver(omap_rng_driver);
diff --git a/drivers/char/hw_random/pseries-rng.c b/drivers/char/hw_random/pseries-rng.c
index bcf86f91800a..63ce51d09af1 100644
--- a/drivers/char/hw_random/pseries-rng.c
+++ b/drivers/char/hw_random/pseries-rng.c
@@ -61,13 +61,13 @@ static struct hwrng pseries_rng = {
         .read           = pseries_rng_read,
 };
 
-static int __init pseries_rng_probe(struct vio_dev *dev,
+static int pseries_rng_probe(struct vio_dev *dev,
                 const struct vio_device_id *id)
 {
         return hwrng_register(&pseries_rng);
 }
 
-static int __exit pseries_rng_remove(struct vio_dev *dev)
+static int pseries_rng_remove(struct vio_dev *dev)
 {
         hwrng_unregister(&pseries_rng);
         return 0;
diff --git a/drivers/char/hw_random/xgene-rng.c b/drivers/char/hw_random/xgene-rng.c
index 23caa05380a8..c37cf754a985 100644
--- a/drivers/char/hw_random/xgene-rng.c
+++ b/drivers/char/hw_random/xgene-rng.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <linux/acpi.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/hw_random.h>
@@ -310,6 +311,14 @@ static int xgene_rng_init(struct hwrng *rng)
         return 0;
 }
 
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id xgene_rng_acpi_match[] = {
+        { "APMC0D18", },
+        { }
+};
+MODULE_DEVICE_TABLE(acpi, xgene_rng_acpi_match);
+#endif
+
 static struct hwrng xgene_rng_func = {
         .name           = "xgene-rng",
         .init           = xgene_rng_init,
@@ -415,6 +424,7 @@ static struct platform_driver xgene_rng_driver = {
         .driver = {
                 .name           = "xgene-rng",
                 .of_match_table = xgene_rng_of_match,
+                .acpi_match_table = ACPI_PTR(xgene_rng_acpi_match),
         },
 };