aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mxs/patches-4.4
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-01-19 22:05:05 +0000
committerZoltan Herpai <wigyori@uid0.hu>2016-01-19 22:05:05 +0000
commit06bcc64f1fb4029954f968c5c4c34f783c74499b (patch)
tree676c1bd8e06bc1f729b8b2453dfbdc9f859c76ba /target/linux/mxs/patches-4.4
parent4e3813c79d99ff8e06327eb11c2cc610d110e5c2 (diff)
downloadupstream-06bcc64f1fb4029954f968c5c4c34f783c74499b.tar.gz
upstream-06bcc64f1fb4029954f968c5c4c34f783c74499b.tar.bz2
upstream-06bcc64f1fb4029954f968c5c4c34f783c74499b.zip
mxs: initial 4.4 support
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> SVN-Revision: 48377
Diffstat (limited to 'target/linux/mxs/patches-4.4')
-rw-r--r--target/linux/mxs/patches-4.4/100-crypto-mxsdcp-provide-importexport.patch80
1 files changed, 80 insertions, 0 deletions
diff --git a/target/linux/mxs/patches-4.4/100-crypto-mxsdcp-provide-importexport.patch b/target/linux/mxs/patches-4.4/100-crypto-mxsdcp-provide-importexport.patch
new file mode 100644
index 0000000000..5aa3d7dc36
--- /dev/null
+++ b/target/linux/mxs/patches-4.4/100-crypto-mxsdcp-provide-importexport.patch
@@ -0,0 +1,80 @@
+From: Fabio Estevam <fabio.estevam@nxp.com>
+
+Currently the mxs-dcp driver fails to probe:
+
+mxs-dcp 80028000.dcp: Failed to register sha1 hash!
+mxs-dcp: probe of 80028000.dcp failed with error -22
+
+This happens since commit 8996eafdcbad ("crypto: ahash - ensure statesize
+is non-zero"), which requires statesize to be filled.
+
+Other than filling statesize, we also need to provide the import/export
+functions.
+
+Based on the implementation of the sahara and caam drivers.
+
+Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
+---
+Changes since v2:
+- Newly introduced in this series
+
+ drivers/crypto/mxs-dcp.c | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c
+index 59ed54e..1e2017f 100644
+--- a/drivers/crypto/mxs-dcp.c
++++ b/drivers/crypto/mxs-dcp.c
+@@ -775,6 +775,24 @@ static void dcp_sha_cra_exit(struct crypto_tfm *tfm)
+ {
+ }
+
++static int dcp_sha_export(struct ahash_request *req, void *out)
++{
++ struct dcp_sha_req_ctx *rctx = ahash_request_ctx(req);
++
++ memcpy(out, rctx, sizeof(struct dcp_sha_req_ctx));
++
++ return 0;
++}
++
++static int dcp_sha_import(struct ahash_request *req, const void *in)
++{
++ struct dcp_sha_req_ctx *rctx = ahash_request_ctx(req);
++
++ memcpy(rctx, in, sizeof(struct dcp_sha_req_ctx));
++
++ return 0;
++}
++
+ /* AES 128 ECB and AES 128 CBC */
+ static struct crypto_alg dcp_aes_algs[] = {
+ {
+@@ -834,8 +852,11 @@ static struct ahash_alg dcp_sha1_alg = {
+ .final = dcp_sha_final,
+ .finup = dcp_sha_finup,
+ .digest = dcp_sha_digest,
++ .import = dcp_sha_import,
++ .export = dcp_sha_export,
+ .halg = {
+ .digestsize = SHA1_DIGEST_SIZE,
++ .statesize = sizeof(struct dcp_sha_req_ctx),
+ .base = {
+ .cra_name = "sha1",
+ .cra_driver_name = "sha1-dcp",
+@@ -858,8 +879,11 @@ static struct ahash_alg dcp_sha256_alg = {
+ .final = dcp_sha_final,
+ .finup = dcp_sha_finup,
+ .digest = dcp_sha_digest,
++ .import = dcp_sha_import,
++ .export = dcp_sha_export,
+ .halg = {
+ .digestsize = SHA256_DIGEST_SIZE,
++ .statesize = sizeof(struct dcp_sha_req_ctx),
+ .base = {
+ .cra_name = "sha256",
+ .cra_driver_name = "sha256-dcp",
+--
+1.9.1
+
+--