From: Vinod Koul <vkoul@kernel.org>
To: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
Matt Mackall <mpm@selenic.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-arm-msm@vger.kernel.org, Stephen Boyd <swboyd@chromium.org>,
Timur Tabi <timur@codeaurora.org>, Vinod Koul <vkoul@kernel.org>
Subject: [PATCH v3 5/6] crypto: qcom: Add support for prng-ee
Date: Tue, 3 Jul 2018 11:34:33 +0530 [thread overview]
Message-ID: <20180703060434.19293-6-vkoul@kernel.org> (raw)
In-Reply-To: <20180703060434.19293-1-vkoul@kernel.org>
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>
---
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
next prev parent reply other threads:[~2018-07-03 6:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-03 6:04 [PATCH v3 0/6] crypto: Add Qcom PRNG support Vinod Koul
2018-07-03 6:04 ` [PATCH v3 1/6] hwrng: remove msm hw_random driver Vinod Koul
2018-07-03 6:04 ` [PATCH v3 2/6] dt-bindings: crypto: Move prng binding to crypto Vinod Koul
2018-07-03 6:04 ` [PATCH v3 3/6] crypto: Add Qcom prng driver Vinod Koul
2018-07-03 13:28 ` Stephan Mueller
2018-07-04 4:10 ` Vinod
2018-07-04 6:10 ` Vinod
2018-07-04 6:16 ` Stephan Mueller
2018-07-04 13:42 ` Timur Tabi
2018-07-04 16:02 ` Stephan Mueller
2018-07-05 6:01 ` Vinod
2018-07-03 6:04 ` [PATCH v3 4/6] dt-bindings: crypto: Add new compatible qcom,prng-ee Vinod Koul
2018-07-03 6:04 ` Vinod Koul [this message]
2018-07-03 6:04 ` [PATCH v3 6/6] crypto: qcom: Add ACPI support Vinod Koul
2018-07-03 14:10 ` Timur Tabi
2018-07-04 4:11 ` Vinod
2018-07-03 17:08 ` Jeffrey Hugo
2018-07-04 4:13 ` Vinod
2018-07-05 14:26 ` Jeffrey Hugo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180703060434.19293-6-vkoul@kernel.org \
--to=vkoul@kernel.org \
--cc=arnd@arndb.de \
--cc=bjorn.andersson@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpm@selenic.com \
--cc=swboyd@chromium.org \
--cc=timur@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox