crypto: talitos/hash - rename first_desc/last_desc to first_request/last_request

In talitos_ahash_req_ctx and talitos_export_state, the fields
first_desc and last_desc describe request-level (not descriptor-level)
state.  Rename them to first_request and last_request for clarity.
last_desc is also removed from talitos_ahash_req_ctx as it is no
longer used.

Cc: stable@vger.kernel.org
Signed-off-by: Paul Louvel <paul.louvel@bootlin.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index fe38bc6aaaab3721b03c6b447a4f07db4b225ff4..1d108aec4ab355331f46a4757ee2c861171ad6e7 100644 (file)
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -944,8 +944,7 @@ struct talitos_ahash_req_ctx {
        u8 buf[2][HASH_MAX_BLOCK_SIZE];
        int buf_idx;
        unsigned int swinit;
-       unsigned int first_desc;
-       unsigned int last_desc;
+       unsigned int first_request;
        unsigned int last_request;
        unsigned int to_hash_later;
        unsigned int nbuf;
@@ -957,8 +956,8 @@ struct talitos_export_state {
        u32 hw_context[TALITOS_MDEU_MAX_CONTEXT_SIZE / sizeof(u32)];
        u8 buf[HASH_MAX_BLOCK_SIZE];
        unsigned int swinit;
-       unsigned int first_desc;
-       unsigned int last_desc;
+       unsigned int first_request;
+       unsigned int last_request;
        unsigned int to_hash_later;
        unsigned int nbuf;
 };
@@ -1822,8 +1821,7 @@ static void ahash_done(struct device *dev,
                 container_of(desc, struct talitos_edesc, desc);
        struct talitos_ahash_req_ctx *req_ctx = ahash_request_ctx(areq);
 
-
-       if (!req_ctx->last_desc && req_ctx->to_hash_later) {
+       if (!req_ctx->last_request && req_ctx->to_hash_later) {
                /* Position any partial block for next update/final/finup */
                req_ctx->buf_idx = (req_ctx->buf_idx + 1) & 1;
                req_ctx->nbuf = req_ctx->to_hash_later;
@@ -1872,7 +1870,7 @@ static void common_nonsnoop_hash(struct talitos_edesc *edesc,
        /* first DWORD empty */
 
        /* hash context in */
-       if (!edesc->first || !req_ctx->first_desc || req_ctx->swinit) {
+       if (!edesc->first || !req_ctx->first_request || req_ctx->swinit) {
                map_single_talitos_ptr_nosync(dev, &desc->ptr[1],
                                              req_ctx->hw_context_size,
                                              req_ctx->hw_context,
@@ -1880,7 +1878,7 @@ static void common_nonsnoop_hash(struct talitos_edesc *edesc,
                req_ctx->swinit = 0;
        }
        /* Indicate next op is not the first. */
-       req_ctx->first_desc = 0;
+       req_ctx->first_request = 0;
 
        /* HMAC key */
        if (ctx->keylen)
@@ -1975,14 +1973,14 @@ ahash_process_req_prepare(struct ahash_request *areq, unsigned int nbytes,
                        edesc->desc.hdr |= DESC_HDR_MODE0_MDEU_CONT;
 
                /* request SEC to INIT hash. */
-               if (req_ctx->first_desc && edesc->first && !req_ctx->swinit)
+               if (req_ctx->first_request && edesc->first && !req_ctx->swinit)
                        edesc->desc.hdr |= DESC_HDR_MODE0_MDEU_INIT;
 
                /*
                 * When the tfm context has a keylen, it's an HMAC.
                 * A first or last (ie. not middle) descriptor must request HMAC.
                 */
-               if (ctx->keylen && ((req_ctx->first_desc && edesc->first) ||
+               if (ctx->keylen && ((req_ctx->first_request && edesc->first) ||
                                    (req_ctx->last_request && edesc->last)))
                        edesc->desc.hdr |= DESC_HDR_MODE0_MDEU_HMAC;
 
@@ -2103,14 +2101,13 @@ static int ahash_init(struct ahash_request *areq)
        /* Initialize the context */
        req_ctx->buf_idx = 0;
        req_ctx->nbuf = 0;
-       req_ctx->first_desc = 1; /* first_desc indicates h/w must init its context */
+       req_ctx->first_request = 1;
        req_ctx->swinit = 0; /* assume h/w init of context */
        size =  (crypto_ahash_digestsize(tfm) <= SHA256_DIGEST_SIZE)
                        ? TALITOS_MDEU_CONTEXT_SIZE_MD5_SHA1_SHA256
                        : TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA512;
        req_ctx->hw_context_size = size;
        req_ctx->last_request = 0;
-       req_ctx->last_desc = 0;
 
        dma = dma_map_single(dev, req_ctx->hw_context, req_ctx->hw_context_size,
                             DMA_TO_DEVICE);
@@ -2202,8 +2199,8 @@ static int ahash_export(struct ahash_request *areq, void *out)
               req_ctx->hw_context_size);
        memcpy(export->buf, req_ctx->buf[req_ctx->buf_idx], req_ctx->nbuf);
        export->swinit = req_ctx->swinit;
-       export->first_desc = req_ctx->first_desc;
-       export->last_desc = req_ctx->last_desc;
+       export->first_request = req_ctx->first_request;
+       export->last_request = req_ctx->last_request;
        export->to_hash_later = req_ctx->to_hash_later;
        export->nbuf = req_ctx->nbuf;
 
@@ -2228,8 +2225,8 @@ static int ahash_import(struct ahash_request *areq, const void *in)
        memcpy(req_ctx->hw_context, export->hw_context, size);
        memcpy(req_ctx->buf[0], export->buf, export->nbuf);
        req_ctx->swinit = export->swinit;
-       req_ctx->first_desc = export->first_desc;
-       req_ctx->last_desc = export->last_desc;
+       req_ctx->first_request = export->first_request;
+       req_ctx->last_request = export->last_request;
        req_ctx->to_hash_later = export->to_hash_later;
        req_ctx->nbuf = export->nbuf;