diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-12-18 22:52:20 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-12-18 22:52:20 +0100 |
| commit | 1ddf624b0b268fdc0b80b1de618b98f8d117afea (patch) | |
| tree | 3d3218332bcb34cb0afa01d6ad996058a3dbcb77 /drivers/crypto/mxs-dcp.c | |
| parent | 6b774eec1f9d3064e9b33634dfa99d5666d0a73a (diff) | |
| parent | bfb9e5c03076a446b1f4f6a523ddc8d723c907a6 (diff) | |
Merge tag 'v4.14.159' into 4.14-2.0.x-imx
This is the 4.14.159 stable release
Conflicts:
arch/arm/Kconfig.debug
arch/arm/boot/dts/imx7s.dtsi
arch/arm/mach-imx/cpuidle-imx6sx.c
drivers/crypto/caam/caamalg.c
drivers/crypto/mxs-dcp.c
drivers/dma/imx-sdma.c
drivers/input/keyboard/imx_keypad.c
drivers/net/can/flexcan.c
drivers/net/can/rx-offload.c
drivers/net/wireless/ath/ath10k/pci.c
drivers/pci/dwc/pci-imx6.c
drivers/spi/spi-fsl-lpspi.c
drivers/usb/dwc3/gadget.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, |