diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-12-19 10:33:36 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-12-19 10:33:36 +0100 |
commit | 01956ef82685c0793214d0bd28889304c7ed9068 (patch) | |
tree | 8d4ec514ba1c9e88cb0fd90871777d4917ff113f /drivers/crypto/mxs-dcp.c | |
parent | 866ced99cbaa08b8dafdc0b0febf49cd6c3cf5a8 (diff) | |
parent | fa8a03bec68d9ef89da72277bd3501ed3daa6217 (diff) |
Merge branch 'github.com/Freescale/linux-fslc/4.14-2.0.x-imx' into toradex_4.14-2.0.x-imx-next
Conflicts:
sound/soc/codecs/sgtl5000.c
Diffstat (limited to 'drivers/crypto/mxs-dcp.c')
-rw-r--r-- | drivers/crypto/mxs-dcp.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c index 4915b9187477..620ffc2f4e62 100644 --- a/drivers/crypto/mxs-dcp.c +++ b/drivers/crypto/mxs-dcp.c @@ -33,7 +33,6 @@ #define DCP_ALIGNMENT 64 - /* * Null hashes to align with hw behavior on imx6sl and ull * these are flipped for consistency with hw output @@ -596,20 +595,8 @@ static int mxs_dcp_run_sha(struct ahash_request *req) desc->payload = 0; desc->status = 0; - /* - * Align driver with hw behavior when generating null hashes - */ - if (rctx->init && rctx->fini && desc->size == 0 && - sdcp->enable_sha_workaround) { - struct hash_alg_common *halg = crypto_hash_alg_common(tfm); - const uint8_t *sha_buf = - (actx->alg == MXS_DCP_CONTROL1_HASH_SELECT_SHA1) ? - sha1_null_hash : sha256_null_hash; - memcpy(sdcp->coh->sha_out_buf, sha_buf, halg->digestsize); - ret = 0; - goto done_run; - } - +==== BASE ==== +==== BASE ==== /* Set HASH_TERM bit for last transfer block. */ if (rctx->fini) { digest_phys = dma_map_single(sdcp->dev, sdcp->coh->sha_out_buf, |