aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto/caam
diff options
context:
space:
mode:
authorHoria Geantă <horia.geanta@nxp.com>2019-02-19 16:56:56 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2019-02-28 14:17:58 +0800
commit8e731ee5e2a5aa37b736c05ee2562e1169af866e (patch)
tree820a3588fe5f8164f33966bfe4fcc911cd0574cc /drivers/crypto/caam
parentcrypto: caam - fix hash context DMA unmap size (diff)
downloadlinux-dev-8e731ee5e2a5aa37b736c05ee2562e1169af866e.tar.xz
linux-dev-8e731ee5e2a5aa37b736c05ee2562e1169af866e.zip
crypto: caam - fix DMA mapping xcbc key twice
Fix a side effect of adding xcbc support, which leads to DMA mapping the key twice. Fixes: 12b8567f6fa4 ("crypto: caam - add support for xcbc(aes)") Signed-off-by: Horia Geantă <horia.geanta@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/caam')
-rw-r--r--drivers/crypto/caam/caamhash.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index 2c5aca59229b..a71408f36654 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -1897,8 +1897,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)
}
dma_addr = dma_map_single_attrs(ctx->jrdev, ctx->sh_desc_update,
- offsetof(struct caam_hash_ctx,
- sh_desc_update_dma),
+ offsetof(struct caam_hash_ctx, key),
ctx->dir, DMA_ATTR_SKIP_CPU_SYNC);
if (dma_mapping_error(ctx->jrdev, dma_addr)) {
dev_err(ctx->jrdev, "unable to map shared descriptors\n");