crypto: caam - remove needless ablkcipher key copy

ablkcipher shared descriptors are relatively small, thus there is enough
space for the key to be inlined.
Accordingly, there is no need to copy the key in ctx->key.

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/caamalg.c b/drivers/crypto/caam/caamalg.c
index baa8dd52472d513d7758b673bfd6297a86a45d52..f5666e50c1e7768a376448236c7c0b48b23c102f 100644 (file)
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -625,7 +625,6 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
        const bool is_rfc3686 = (ctr_mode &&
                                 (strstr(alg_name, "rfc3686") != NULL));
 
-       memcpy(ctx->key, key, keylen);
 #ifdef DEBUG
        print_hex_dump(KERN_ERR, "key in @"__stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);
@@ -648,9 +647,8 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
                keylen -= CTR_RFC3686_NONCE_SIZE;
        }
 
-       dma_sync_single_for_device(jrdev, ctx->key_dma, keylen, DMA_TO_DEVICE);
        ctx->cdata.keylen = keylen;
-       ctx->cdata.key_virt = ctx->key;
+       ctx->cdata.key_virt = key;
        ctx->cdata.key_inline = true;
 
        /* ablkcipher_encrypt shared descriptor */
@@ -691,10 +689,8 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
                return -EINVAL;
        }
 
-       memcpy(ctx->key, key, keylen);
-       dma_sync_single_for_device(jrdev, ctx->key_dma, keylen, DMA_TO_DEVICE);
        ctx->cdata.keylen = keylen;
-       ctx->cdata.key_virt = ctx->key;
+       ctx->cdata.key_virt = key;
        ctx->cdata.key_inline = true;
 
        /* xts_ablkcipher_encrypt shared descriptor */

diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index ad14b69a052ee789f955940fc03572e793936d53..b45401786530c2488730f2a9e06aba48f6a00a06 100644 (file)
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -272,7 +272,6 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
        const bool is_rfc3686 = (ctr_mode && strstr(alg_name, "rfc3686"));
        int ret = 0;
 
-       memcpy(ctx->key, key, keylen);
 #ifdef DEBUG
        print_hex_dump(KERN_ERR, "key in @" __stringify(__LINE__)": ",
                       DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1);
@@ -295,9 +294,8 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
                keylen -= CTR_RFC3686_NONCE_SIZE;
        }
 
-       dma_sync_single_for_device(jrdev, ctx->key_dma, keylen, DMA_TO_DEVICE);
        ctx->cdata.keylen = keylen;
-       ctx->cdata.key_virt = ctx->key;
+       ctx->cdata.key_virt = key;
        ctx->cdata.key_inline = true;
 
        /* ablkcipher encrypt, decrypt, givencrypt shared descriptors */
@@ -356,10 +354,8 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
                return -EINVAL;
        }
 
-       memcpy(ctx->key, key, keylen);
-       dma_sync_single_for_device(jrdev, ctx->key_dma, keylen, DMA_TO_DEVICE);
        ctx->cdata.keylen = keylen;
-       ctx->cdata.key_virt = ctx->key;
+       ctx->cdata.key_virt = key;
        ctx->cdata.key_inline = true;
 
        /* xts ablkcipher encrypt, decrypt shared descriptors */