10 files changed, 261 insertions, 27 deletions

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index d31483c54883..a60043b3e409 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -49,7 +49,7 @@ config HW_RANDOM_INTEL
 
 config HW_RANDOM_AMD
         tristate "AMD HW Random Number Generator support"
-        depends on HW_RANDOM && X86 && PCI
+        depends on HW_RANDOM && (X86 || PPC_MAPLE) && PCI
         default HW_RANDOM
         ---help---
           This driver provides kernel-side support for the Random Number
@@ -198,3 +198,15 @@ config HW_RANDOM_NOMADIK
           module will be called nomadik-rng.
 
           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.
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
index 4273308aa1e3..3db4eb8b19c0 100644
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@ -19,3 +19,4 @@ 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
diff --git a/drivers/char/hw_random/amd-rng.c b/drivers/char/hw_random/amd-rng.c
index 0d8c5788b8e4..c6af038682f1 100644
--- a/drivers/char/hw_random/amd-rng.c
+++ b/drivers/char/hw_random/amd-rng.c
@@ -133,6 +133,12 @@ found:
         pmbase &= 0x0000FF00;
         if (pmbase == 0)
                 goto out;
+        if (!request_region(pmbase + 0xF0, 8, "AMD HWRNG")) {
+                dev_err(&pdev->dev, "AMD HWRNG region 0x%x already in use!\n",
+                        pmbase + 0xF0);
+                err = -EBUSY;
+                goto out;
+        }
         amd_rng.priv = (unsigned long)pmbase;
         amd_pdev = pdev;
 
@@ -141,6 +147,7 @@ found:
         if (err) {
                 printk(KERN_ERR PFX "RNG registering failed (%d)\n",
                        err);
+                release_region(pmbase + 0xF0, 8);
                 goto out;
         }
 out:
@@ -149,6 +156,8 @@ out:
 
 static void __exit mod_exit(void)
 {
+        u32 pmbase = (unsigned long)amd_rng.priv;
+        release_region(pmbase + 0xF0, 8);
         hwrng_unregister(&amd_rng);
 }
 
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 3d9c61e5acbf..2016aad85203 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -37,7 +37,6 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
@@ -170,6 +169,7 @@ static const struct file_operations rng_chrdev_ops = {
         .owner          = THIS_MODULE,
         .open           = rng_dev_open,
         .read           = rng_dev_read,
+        .llseek         = noop_llseek,
 };
 
 static struct miscdevice rng_miscdev = {
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index a3f5e381e746..ac6739e085e3 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -619,15 +619,20 @@ static void __devinit n2rng_driver_version(void)
                 pr_info("%s", version);
 }
 
-static int __devinit n2rng_probe(struct platform_device *op,
-                                 const struct of_device_id *match)
+static const struct of_device_id n2rng_match[];
+static int __devinit n2rng_probe(struct platform_device *op)
 {
-        int victoria_falls = (match->data != NULL);
+        const struct of_device_id *match;
+        int victoria_falls;
         int err = -ENOMEM;
         struct n2rng *np;
 
-        n2rng_driver_version();
+        match = of_match_device(n2rng_match, &op->dev);
+        if (!match)
+                return -EINVAL;
+        victoria_falls = (match->data != NULL);
 
+        n2rng_driver_version();
         np = kzalloc(sizeof(*np), GFP_KERNEL);
         if (!np)
                 goto out;
@@ -750,7 +755,7 @@ static const struct of_device_id n2rng_match[] = {
 };
 MODULE_DEVICE_TABLE(of, n2rng_match);
 
-static struct of_platform_driver n2rng_driver = {
+static struct platform_driver n2rng_driver = {
         .driver = {
                 .name = "n2rng",
                 .owner = THIS_MODULE,
@@ -762,12 +767,12 @@ static struct of_platform_driver n2rng_driver = {
 
 static int __init n2rng_init(void)
 {
-        return of_register_platform_driver(&n2rng_driver);
+        return platform_driver_register(&n2rng_driver);
 }
 
 static void __exit n2rng_exit(void)
 {
-        of_unregister_platform_driver(&n2rng_driver);
+        platform_driver_unregister(&n2rng_driver);
 }
 
 module_init(n2rng_init);
diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c
index a348c7e9aa0b..dd1d143eb8ea 100644
--- a/drivers/char/hw_random/nomadik-rng.c
+++ b/drivers/char/hw_random/nomadik-rng.c
@@ -39,7 +39,7 @@ static struct hwrng nmk_rng = {
         .read           = nmk_rng_read,
 };
 
-static int nmk_rng_probe(struct amba_device *dev, struct amba_id *id)
+static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
 {
         void __iomem *base;
         int ret;
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 06aad0831c73..2cc755a64302 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -91,7 +91,7 @@ static struct hwrng omap_rng_ops = {
 
 static int __devinit omap_rng_probe(struct platform_device *pdev)
 {
-        struct resource *res, *mem;
+        struct resource *res;
         int ret;
 
         /*
@@ -116,14 +116,12 @@ static int __devinit omap_rng_probe(struct platform_device *pdev)
         if (!res)
                 return -ENOENT;
 
-        mem = request_mem_region(res->start, resource_size(res),
-                                 pdev->name);
-        if (mem == NULL) {
+        if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
                 ret = -EBUSY;
                 goto err_region;
         }
 
-        dev_set_drvdata(&pdev->dev, mem);
+        dev_set_drvdata(&pdev->dev, res);
         rng_base = ioremap(res->start, resource_size(res));
         if (!rng_base) {
                 ret = -ENOMEM;
@@ -146,7 +144,7 @@ err_register:
         iounmap(rng_base);
         rng_base = NULL;
 err_ioremap:
-        release_resource(mem);
+        release_mem_region(res->start, resource_size(res));
 err_region:
         if (cpu_is_omap24xx()) {
                 clk_disable(rng_ick);
@@ -157,7 +155,7 @@ err_region:
 
 static int __exit omap_rng_remove(struct platform_device *pdev)
 {
-        struct resource *mem = dev_get_drvdata(&pdev->dev);
+        struct resource *res = dev_get_drvdata(&pdev->dev);
 
         hwrng_unregister(&omap_rng_ops);
 
@@ -170,7 +168,7 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
                 clk_put(rng_ick);
         }
 
-        release_resource(mem);
+        release_mem_region(res->start, resource_size(res));
         rng_base = NULL;
 
         return 0;
diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c
index a31c830ca8cd..1d504815e6db 100644
--- a/drivers/char/hw_random/pasemi-rng.c
+++ b/drivers/char/hw_random/pasemi-rng.c
@@ -94,8 +94,7 @@ static struct hwrng pasemi_rng = {
         .data_read      = pasemi_rng_data_read,
 };
 
-static int __devinit rng_probe(struct platform_device *ofdev,
-                               const struct of_device_id *match)
+static int __devinit rng_probe(struct platform_device *ofdev)
 {
         void __iomem *rng_regs;
         struct device_node *rng_np = ofdev->dev.of_node;
@@ -139,7 +138,7 @@ static struct of_device_id rng_match[] = {
         { },
 };
 
-static struct of_platform_driver rng_driver = {
+static struct platform_driver rng_driver = {
         .driver = {
                 .name = "pasemi-rng",
                 .owner = THIS_MODULE,
@@ -151,13 +150,13 @@ static struct of_platform_driver rng_driver = {
 
 static int __init rng_init(void)
 {
-        return of_register_platform_driver(&rng_driver);
+        return platform_driver_register(&rng_driver);
 }
 module_init(rng_init);
 
 static void __exit rng_exit(void)
 {
-        of_unregister_platform_driver(&rng_driver);
+        platform_driver_unregister(&rng_driver);
 }
 module_exit(rng_exit);
 
diff --git a/drivers/char/hw_random/picoxcell-rng.c b/drivers/char/hw_random/picoxcell-rng.c
new file mode 100644
index 000000000000..990d55a5e3e8
--- /dev/null
+++ b/drivers/char/hw_random/picoxcell-rng.c
@@ -0,0 +1,208 @@
+/*
+ * 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;
+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);
+
+        if (!mem) {
+                dev_warn(&pdev->dev, "no memory resource\n");
+                return -ENOMEM;
+        }
+
+        if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem),
+                                     "picoxcell_trng")) {
+                dev_warn(&pdev->dev, "unable to request io mem\n");
+                return -EBUSY;
+        }
+
+        rng_base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
+        if (!rng_base) {
+                dev_warn(&pdev->dev, "unable to remap io mem\n");
+                return -ENOMEM;
+        }
+
+        rng_clk = 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");
+                goto err_enable;
+        }
+
+        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);
+err_enable:
+        clk_put(rng_clk);
+
+        return ret;
+}
+
+static int __devexit picoxcell_trng_remove(struct platform_device *pdev)
+{
+        hwrng_unregister(&picoxcell_trng);
+        clk_disable(rng_clk);
+        clk_put(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         = __devexit_p(picoxcell_trng_remove),
+        .driver         = {
+                .name   = "picoxcell-trng",
+                .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &picoxcell_trng_pm_ops,
+#endif /* CONFIG_PM */
+        },
+};
+
+static int __init picoxcell_trng_init(void)
+{
+        return platform_driver_register(&picoxcell_trng_driver);
+}
+module_init(picoxcell_trng_init);
+
+static void __exit picoxcell_trng_exit(void)
+{
+        platform_driver_unregister(&picoxcell_trng_driver);
+}
+module_exit(picoxcell_trng_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jamie Iles");
+MODULE_DESCRIPTION("Picochip picoXcell TRNG driver");
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;
 }