From: Horia Geantă <horia.geanta@nxp.com> Date: Tue, 19 Feb 2019 14:56:56 +0000 (+0200) Subject: crypto: caam - fix DMA mapping xcbc key twice X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8e731ee5e2a5aa37b736c05ee2562e1169af866e;p=openwrt%2Fstaging%2Fblogic.git 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> --- 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");