crypto: chelsio - Use x8_ble gf multiplication to calculate IV.

gf128mul_x8_ble() will reduce gf Multiplication iteration by 8.

Signed-off-by: Harsh Jain <harsh@chelsio.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c
index 9c70266002d1eb87f8f26102a8645feef0456831..8c60fde07433d74a2f4250f82a1405724a75171c 100644 (file)
--- a/drivers/crypto/chelsio/chcr_algo.c
+++ b/drivers/crypto/chelsio/chcr_algo.c
@@ -889,9 +889,11 @@ static int chcr_update_tweak(struct ablkcipher_request *req, u8 *iv)
        int ret, i;
        u8 *key;
        unsigned int keylen;
+       int round = reqctx->last_req_len / AES_BLOCK_SIZE;
+       int round8 = round / 8;
 
        cipher = ablkctx->aes_generic;
-       memcpy(iv, req->info, AES_BLOCK_SIZE);
+       memcpy(iv, reqctx->iv, AES_BLOCK_SIZE);
 
        keylen = ablkctx->enckey_len / 2;
        key = ablkctx->key + keylen;
@@ -900,7 +902,10 @@ static int chcr_update_tweak(struct ablkcipher_request *req, u8 *iv)
                goto out;
 
        crypto_cipher_encrypt_one(cipher, iv, iv);
-       for (i = 0; i < (reqctx->processed / AES_BLOCK_SIZE); i++)
+       for (i = 0; i < round8; i++)
+               gf128mul_x8_ble((le128 *)iv, (le128 *)iv);
+
+       for (i = 0; i < (round % 8); i++)
                gf128mul_x_ble((le128 *)iv, (le128 *)iv);
 
        crypto_cipher_decrypt_one(cipher, iv, iv);
@@ -1041,6 +1046,7 @@ static int chcr_handle_cipher_resp(struct ablkcipher_request *req,
            CRYPTO_ALG_SUB_TYPE_CTR)
                bytes = adjust_ctr_overflow(reqctx->iv, bytes);
        reqctx->processed += bytes;
+       reqctx->last_req_len = bytes;
        wrparam.qid = u_ctx->lldi.rxq_ids[ctx->rx_qidx];
        wrparam.req = req;
        wrparam.bytes = bytes;
@@ -1133,6 +1139,7 @@ static int process_cipher(struct ablkcipher_request *req,
                goto error;
        }
        reqctx->processed = bytes;
+       reqctx->last_req_len = bytes;
        reqctx->dst = reqctx->dstsg;
        reqctx->op = op_type;
        wrparam.qid = qid;

diff --git a/drivers/crypto/chelsio/chcr_crypto.h b/drivers/crypto/chelsio/chcr_crypto.h
index 30af1ee17b876fb0d7d4ceca1327202f4317f67c..b3722b3cbd38a142c5eb54e0dd8fb63d5b115e08 100644 (file)
--- a/drivers/crypto/chelsio/chcr_crypto.h
+++ b/drivers/crypto/chelsio/chcr_crypto.h
@@ -247,6 +247,7 @@ struct chcr_blkcipher_req_ctx {
        struct scatterlist *dst;
        struct scatterlist *newdstsg;
        unsigned int processed;
+       unsigned int last_req_len;
        unsigned int op;
        short int dst_nents;
        u8 iv[CHCR_MAX_CRYPTO_IV_LEN];