]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
crypto: atmel-sha - correct the max burst size
authorLeilei Zhao <leilei.zhao@atmel.com>
Tue, 7 Apr 2015 09:45:07 +0000 (17:45 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 8 Apr 2015 14:20:03 +0000 (22:20 +0800)
The maximum source and destination burst size is 16
according to the datasheet of Atmel DMA. And the value
is also checked in function at_xdmac_csize of Atmel
DMA driver. With the restrict, the value beyond maximum
value will not be processed in DMA driver, so SHA384 and
SHA512 will not work and the program will wait forever.

So here change the max burst size of all the cases to 16
in order to make SHA384 and SHA512 work and keep consistent
with DMA driver and datasheet.

Signed-off-by: Leilei Zhao <leilei.zhao@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/atmel-sha.c

index 08dfddfcffbb72866fd497218ded7841857d18cf..5b35433c5399b1264712d6b785cacea6abca5c9b 100644 (file)
@@ -432,14 +432,8 @@ static int atmel_sha_xmit_dma(struct atmel_sha_dev *dd, dma_addr_t dma_addr1,
        dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",
                ctx->digcnt[1], ctx->digcnt[0], length1, final);
 
-       if (ctx->flags & (SHA_FLAGS_SHA1 | SHA_FLAGS_SHA224 |
-                       SHA_FLAGS_SHA256)) {
-               dd->dma_lch_in.dma_conf.src_maxburst = 16;
-               dd->dma_lch_in.dma_conf.dst_maxburst = 16;
-       } else {
-               dd->dma_lch_in.dma_conf.src_maxburst = 32;
-               dd->dma_lch_in.dma_conf.dst_maxburst = 32;
-       }
+       dd->dma_lch_in.dma_conf.src_maxburst = 16;
+       dd->dma_lch_in.dma_conf.dst_maxburst = 16;
 
        dmaengine_slave_config(dd->dma_lch_in.chan, &dd->dma_lch_in.dma_conf);