crypto: qcom-rng - Add support for prng-ee
authorVinod Koul <vkoul@kernel.org>
Mon, 16 Jul 2018 05:50:26 +0000 (11:20 +0530)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 27 Jul 2018 11:04:32 +0000 (19:04 +0800)
Qcom 8996 and later chips features multiple Execution Environments
(EE) and secure world is typically responsible for configuring the
prng.

Add driver data for qcom,prng as 0 and qcom,prng-ee as 1 and use
that to skip initialization routine.

Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/qcom-rng.c

index e921382099d78fb26418bfa4d1145e18a2dc1cd5..80544326e310fd7499715d19fa40c884027e7819 100644 (file)
@@ -28,6 +28,7 @@ struct qcom_rng {
        struct mutex lock;
        void __iomem *base;
        struct clk *clk;
+       unsigned int skip_init;
 };
 
 struct qcom_rng_ctx {
@@ -128,7 +129,10 @@ static int qcom_rng_init(struct crypto_tfm *tfm)
 
        ctx->rng = qcom_rng_dev;
 
-       return qcom_rng_enable(ctx->rng);
+       if (!ctx->rng->skip_init)
+               return qcom_rng_enable(ctx->rng);
+
+       return 0;
 }
 
 static struct rng_alg qcom_rng_alg = {
@@ -168,6 +172,8 @@ static int qcom_rng_probe(struct platform_device *pdev)
        if (IS_ERR(rng->clk))
                return PTR_ERR(rng->clk);
 
+       rng->skip_init = (unsigned long)device_get_match_data(&pdev->dev);
+
        qcom_rng_dev = rng;
        ret = crypto_register_rng(&qcom_rng_alg);
        if (ret) {
@@ -188,7 +194,8 @@ static int qcom_rng_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id qcom_rng_of_match[] = {
-       { .compatible = "qcom,prng" },
+       { .compatible = "qcom,prng", .data = (void *)0},
+       { .compatible = "qcom,prng-ee", .data = (void *)1},
        {}
 };
 MODULE_DEVICE_TABLE(of, qcom_rng_of_match);