mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
644f65afe1
This patch backports several patches that went upstream into
Herbert Xu's cryptodev-2.6 tree:
crypto: Use zeroing memory allocator instead of allocator/memset
crypto: crypto4xx - performance optimizations
crypto: crypto4xx - convert to skcipher
crypto: crypto4xx - avoid VLA use
crypto: crypto4xx - add aes-ctr support
crypto: crypto4xx - properly set IV after de- and encrypt
crypto: crypto4xx - extend aead fallback checks
crypto: crypto4xx - put temporary dst sg into request ctx
The older, outstanding patches from 120-wxyz series have been
upstreamed as well and therefore they have been reassigned to
fit into the series.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
(cherry picked from commit 16e39624b7)
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 75d68369b544acc5d14c18a827654dfff248d09d Mon Sep 17 00:00:00 2001
|
|
From: Himanshu Jha <himanshujha199640@gmail.com>
|
|
Date: Sun, 31 Dec 2017 17:54:23 +0530
|
|
Subject: [PATCH 1/8] crypto: Use zeroing memory allocator instead of
|
|
allocator/memset
|
|
|
|
Use dma_zalloc_coherent for allocating zeroed
|
|
memory and remove unnecessary memset function.
|
|
|
|
Done using Coccinelle.
|
|
Generated-by: scripts/coccinelle/api/alloc/kzalloc-simple.cocci
|
|
0-day tested with no failures.
|
|
|
|
Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
---
|
|
drivers/crypto/amcc/crypto4xx_core.c | 8 +++-----
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/crypto/amcc/crypto4xx_core.c
|
|
+++ b/drivers/crypto/amcc/crypto4xx_core.c
|
|
@@ -282,14 +282,12 @@ static u32 crypto4xx_put_pd_to_pdr(struc
|
|
*/
|
|
static u32 crypto4xx_build_gdr(struct crypto4xx_device *dev)
|
|
{
|
|
- dev->gdr = dma_alloc_coherent(dev->core_dev->device,
|
|
- sizeof(struct ce_gd) * PPC4XX_NUM_GD,
|
|
- &dev->gdr_pa, GFP_ATOMIC);
|
|
+ dev->gdr = dma_zalloc_coherent(dev->core_dev->device,
|
|
+ sizeof(struct ce_gd) * PPC4XX_NUM_GD,
|
|
+ &dev->gdr_pa, GFP_ATOMIC);
|
|
if (!dev->gdr)
|
|
return -ENOMEM;
|
|
|
|
- memset(dev->gdr, 0, sizeof(struct ce_gd) * PPC4XX_NUM_GD);
|
|
-
|
|
return 0;
|
|
}
|
|
|