Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / drivers / char / hw_random / bcm63xx-rng.c

diff --git a/drivers/char/hw_random/bcm63xx-rng.c b/drivers/char/hw_random/bcm63xx-rng.c
index ba6a65ac023be489abd8d7ebf590b57869084541..d1494ecd9e116490dd5c5875387be7e6a2a92fde 100644 (file)
--- 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",
        },