[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180703060434.19293-6-vkoul@kernel.org>
Date: Tue, 3 Jul 2018 11:34:33 +0530
From: Vinod Koul <vkoul@...nel.org>
To: linux-crypto@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Bjorn Andersson <bjorn.andersson@...aro.org>,
Matt Mackall <mpm@...enic.com>,
Herbert Xu <herbert@...dor.apana.org.au>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
linux-arm-msm@...r.kernel.org, Stephen Boyd <swboyd@...omium.org>,
Timur Tabi <timur@...eaurora.org>,
Vinod Koul <vkoul@...nel.org>
Subject: [PATCH v3 5/6] crypto: qcom: Add support for prng-ee
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@...nel.org>
---
drivers/crypto/qcom-rng.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c
index e235a35359d3..fdbbcac7bcb8 100644
--- a/drivers/crypto/qcom-rng.c
+++ b/drivers/crypto/qcom-rng.c
@@ -30,6 +30,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)of_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);
--
2.14.4
Powered by blists - more mailing lists