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

Pull crypto updates from Herbert Xu:
 "Here is the crypto update for 3.15:
   - Added 3DES driver for OMAP4/AM43xx
   - Added AVX2 acceleration for SHA
   - Added hash-only AEAD algorithms in caam
   - Removed tegra driver as it is not functioning and the hardware is
     too slow
   - Allow blkcipher walks over AEAD (needed for ARM)
   - Fixed unprotected FPU/SSE access in ghash-clmulni-intel
   - Fixed highmem crash in omap-sham
   - Add (zero entropy) randomness when initialising hardware RNGs
   - Fixed unaligned ahash comletion functions
   - Added soft module depedency for crc32c for initrds that use crc32c"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (60 commits)
  crypto: ghash-clmulni-intel - use C implementation for setkey()
  crypto: x86/sha1 - reduce size of the AVX2 asm implementation
  crypto: x86/sha1 - fix stack alignment of AVX2 variant
  crypto: x86/sha1 - re-enable the AVX variant
  crypto: sha - SHA1 transform x86_64 AVX2
  crypto: crypto_wq - Fix late crypto work queue initialization
  crypto: caam - add missing key_dma unmap
  crypto: caam - add support for aead null encryption
  crypto: testmgr - add aead null encryption test vectors
  crypto: export NULL algorithms defines
  crypto: caam - remove error propagation handling
  crypto: hash - Simplify the ahash_finup implementation
  crypto: hash - Pull out the functions to save/restore request
  crypto: hash - Fix the pointer voodoo in unaligned ahash
  crypto: caam - Fix first parameter to caam_init_rng
  crypto: omap-sham - Map SG pages if they are HIGHMEM before accessing
  crypto: caam - Dynamic memory allocation for caam_rng_ctx object
  crypto: allow blkcipher walks over AEAD data
  crypto: remove direct blkcipher_walk dependency on transform
  hwrng: add randomness to system from rng sources
  ...

6 files changed, 36 insertions, 87 deletions

diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c
index bf9fc6b79328..851bc7e20ad2 100644
--- a/drivers/char/hw_random/atmel-rng.c
+++ b/drivers/char/hw_random/atmel-rng.c
@@ -54,29 +54,22 @@ static int atmel_trng_probe(struct platform_device *pdev)
         struct resource *res;
         int ret;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res)
-                return -EINVAL;
-
         trng = devm_kzalloc(&pdev->dev, sizeof(*trng), GFP_KERNEL);
         if (!trng)
                 return -ENOMEM;
 
-        if (!devm_request_mem_region(&pdev->dev, res->start,
-                                     resource_size(res), pdev->name))
-                return -EBUSY;
-
-        trng->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
-        if (!trng->base)
-                return -EBUSY;
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        trng->base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(trng->base))
+                return PTR_ERR(trng->base);
 
-        trng->clk = clk_get(&pdev->dev, NULL);
+        trng->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(trng->clk))
                 return PTR_ERR(trng->clk);
 
         ret = clk_enable(trng->clk);
         if (ret)
-                goto err_enable;
+                return ret;
 
         writel(TRNG_KEY | 1, trng->base + TRNG_CR);
         trng->rng.name = pdev->name;
@@ -92,9 +85,6 @@ static int atmel_trng_probe(struct platform_device *pdev)
 
 err_register:
         clk_disable(trng->clk);
-err_enable:
-        clk_put(trng->clk);
-
         return ret;
 }
 
@@ -106,7 +96,6 @@ static int atmel_trng_remove(struct platform_device *pdev)
 
         writel(TRNG_KEY, trng->base + TRNG_CR);
         clk_disable(trng->clk);
-        clk_put(trng->clk);
 
         return 0;
 }
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index b9495a8c05c6..334601cc81cf 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -40,6 +40,7 @@
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/random.h>
 #include <asm/uaccess.h>
 
 
@@ -301,9 +302,10 @@ err_misc_dereg:
 
 int hwrng_register(struct hwrng *rng)
 {
-        int must_register_misc;
         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))
@@ -326,7 +328,6 @@ int hwrng_register(struct hwrng *rng)
                         goto out_unlock;
         }
 
-        must_register_misc = (current_rng == NULL);
         old_rng = current_rng;
         if (!old_rng) {
                 err = hwrng_init(rng);
@@ -335,18 +336,20 @@ int hwrng_register(struct hwrng *rng)
                 current_rng = rng;
         }
         err = 0;
-        if (must_register_misc) {
+        if (!old_rng) {
                 err = register_miscdev();
                 if (err) {
-                        if (!old_rng) {
-                                hwrng_cleanup(rng);
-                                current_rng = NULL;
-                        }
+                        hwrng_cleanup(rng);
+                        current_rng = NULL;
                         goto out_unlock;
                 }
         }
         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);
 out_unlock:
         mutex_unlock(&rng_mutex);
 out:
diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c
index 00e9d2d46634..9c8581577246 100644
--- a/drivers/char/hw_random/nomadik-rng.c
+++ b/drivers/char/hw_random/nomadik-rng.c
@@ -43,7 +43,7 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
         void __iomem *base;
         int ret;
 
-        rng_clk = clk_get(&dev->dev, NULL);
+        rng_clk = devm_clk_get(&dev->dev, NULL);
         if (IS_ERR(rng_clk)) {
                 dev_err(&dev->dev, "could not get rng clock\n");
                 ret = PTR_ERR(rng_clk);
@@ -56,33 +56,28 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
         if (ret)
                 goto out_clk;
         ret = -ENOMEM;
-        base = ioremap(dev->res.start, resource_size(&dev->res));
+        base = devm_ioremap(&dev->dev, dev->res.start,
+                            resource_size(&dev->res));
         if (!base)
                 goto out_release;
         nmk_rng.priv = (unsigned long)base;
         ret = hwrng_register(&nmk_rng);
         if (ret)
-                goto out_unmap;
+                goto out_release;
         return 0;
 
-out_unmap:
-        iounmap(base);
 out_release:
         amba_release_regions(dev);
 out_clk:
         clk_disable(rng_clk);
-        clk_put(rng_clk);
         return ret;
 }
 
 static int nmk_rng_remove(struct amba_device *dev)
 {
-        void __iomem *base = (void __iomem *)nmk_rng.priv;
         hwrng_unregister(&nmk_rng);
-        iounmap(base);
         amba_release_regions(dev);
         clk_disable(rng_clk);
-        clk_put(rng_clk);
         return 0;
 }
 
diff --git a/drivers/char/hw_random/omap3-rom-rng.c b/drivers/char/hw_random/omap3-rom-rng.c
index c853e9e68573..6f2eaffed623 100644
--- a/drivers/char/hw_random/omap3-rom-rng.c
+++ b/drivers/char/hw_random/omap3-rom-rng.c
@@ -103,7 +103,7 @@ static int omap3_rom_rng_probe(struct platform_device *pdev)
         }
 
         setup_timer(&idle_timer, omap3_rom_rng_idle, 0);
-        rng_clk = clk_get(&pdev->dev, "ick");
+        rng_clk = devm_clk_get(&pdev->dev, "ick");
         if (IS_ERR(rng_clk)) {
                 pr_err("unable to get RNG clock\n");
                 return PTR_ERR(rng_clk);
@@ -120,7 +120,6 @@ static int omap3_rom_rng_remove(struct platform_device *pdev)
 {
         hwrng_unregister(&omap3_rom_rng_ops);
         clk_disable_unprepare(rng_clk);
-        clk_put(rng_clk);
         return 0;
 }
 
diff --git a/drivers/char/hw_random/picoxcell-rng.c b/drivers/char/hw_random/picoxcell-rng.c
index 3d4c2293c6f5..eab5448ad56f 100644
--- a/drivers/char/hw_random/picoxcell-rng.c
+++ b/drivers/char/hw_random/picoxcell-rng.c
@@ -104,24 +104,11 @@ 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_resource(&pdev->dev, mem);
+        if (IS_ERR(rng_base))
+                return PTR_ERR(rng_base);
 
-        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);
+        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);
@@ -130,7 +117,7 @@ static int picoxcell_trng_probe(struct platform_device *pdev)
         ret = clk_enable(rng_clk);
         if (ret) {
                 dev_warn(&pdev->dev, "unable to enable clk\n");
-                goto err_enable;
+                return ret;
         }
 
         picoxcell_trng_start();
@@ -145,9 +132,6 @@ static int picoxcell_trng_probe(struct platform_device *pdev)
 
 err_register:
         clk_disable(rng_clk);
-err_enable:
-        clk_put(rng_clk);
-
         return ret;
 }
 
@@ -155,7 +139,6 @@ static int picoxcell_trng_remove(struct platform_device *pdev)
 {
         hwrng_unregister(&picoxcell_trng);
         clk_disable(rng_clk);
-        clk_put(rng_clk);
 
         return 0;
 }
diff --git a/drivers/char/hw_random/timeriomem-rng.c b/drivers/char/hw_random/timeriomem-rng.c
index 73ce739f8e19..439ff8b28c43 100644
--- a/drivers/char/hw_random/timeriomem-rng.c
+++ b/drivers/char/hw_random/timeriomem-rng.c
@@ -118,7 +118,8 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
         }
 
         /* Allocate memory for the device structure (and zero it) */
-        priv = kzalloc(sizeof(struct timeriomem_rng_private_data), GFP_KERNEL);
+        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");
                 return -ENOMEM;
@@ -134,17 +135,16 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
                         period = i;
                 else {
                         dev_err(&pdev->dev, "missing period\n");
-                        err = -EINVAL;
-                        goto out_free;
+                        return -EINVAL;
                 }
-        } else
+        } else {
                 period = pdata->period;
+        }
 
         priv->period = usecs_to_jiffies(period);
         if (priv->period < 1) {
                 dev_err(&pdev->dev, "period is less than one jiffy\n");
-                err = -EINVAL;
-                goto out_free;
+                return -EINVAL;
         }
 
         priv->expires   = jiffies;
@@ -160,24 +160,16 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
         priv->timeriomem_rng_ops.data_read      = timeriomem_rng_data_read;
         priv->timeriomem_rng_ops.priv           = (unsigned long)priv;
 
-        if (!request_mem_region(res->start, resource_size(res),
-                                dev_name(&pdev->dev))) {
-                dev_err(&pdev->dev, "request_mem_region failed\n");
-                err = -EBUSY;
+        priv->io_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(priv->io_base)) {
+                err = PTR_ERR(priv->io_base);
                 goto out_timer;
         }
 
-        priv->io_base = ioremap(res->start, resource_size(res));
-        if (priv->io_base == NULL) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                err = -EIO;
-                goto out_release_io;
-        }
-
         err = hwrng_register(&priv->timeriomem_rng_ops);
         if (err) {
                 dev_err(&pdev->dev, "problem registering\n");
-                goto out;
+                goto out_timer;
         }
 
         dev_info(&pdev->dev, "32bits from 0x%p @ %dus\n",
@@ -185,30 +177,18 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
 
         return 0;
 
-out:
-        iounmap(priv->io_base);
-out_release_io:
-        release_mem_region(res->start, resource_size(res));
 out_timer:
         del_timer_sync(&priv->timer);
-out_free:
-        kfree(priv);
         return err;
 }
 
 static int timeriomem_rng_remove(struct platform_device *pdev)
 {
         struct timeriomem_rng_private_data *priv = platform_get_drvdata(pdev);
-        struct resource *res;
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         hwrng_unregister(&priv->timeriomem_rng_ops);
 
         del_timer_sync(&priv->timer);
-        iounmap(priv->io_base);
-        release_mem_region(res->start, resource_size(res));
-        kfree(priv);
 
         return 0;
 }