[PATCH 10/13] mv_cesa: reorganise mv_start_new_hash_req a bit

[Phil Sutter]

Check and exit early for whether CESA can be used at all.

Signed-off-by: Phil Sutter <phil.sut...@viprinet.com>
---
 drivers/crypto/mv_cesa.c |   61 +++++++++++++++++++++++++---------------------
 1 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index 7917d1a..9c65980 100644
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -806,35 +806,13 @@ static void mv_start_new_hash_req(struct ahash_request 
*req)
        else
                ctx->extra_bytes = 0;
 
-       p->src_sg = req->src;
-       if (req->nbytes) {
-               BUG_ON(!req->src);
-               p->sg_src_left = req->src->length;
-       }
-
-       if (hw_bytes) {
-               p->hw_nbytes = hw_bytes;
-               p->complete = mv_hash_algo_completion;
-               p->process = mv_update_hash_config;
-
-               if (unlikely(old_extra_bytes)) {
-                       dma_sync_single_for_device(cpg->dev, ctx->buffer_dma,
-                                       SHA1_BLOCK_SIZE, DMA_TO_DEVICE);
-                       mv_dma_memcpy(cpg->sram_phys + SRAM_DATA_IN_START,
-                                       ctx->buffer_dma, old_extra_bytes);
-                       p->crypt_len = old_extra_bytes;
+       if (unlikely(!hw_bytes)) { /* too little data for CESA */
+               if (req->nbytes) {
+                       p->src_sg = req->src;
+                       p->sg_src_left = req->src->length;
+                       copy_src_to_buf(p, ctx->buffer + old_extra_bytes,
+                                       req->nbytes);
                }
-
-               if (!mv_dma_map_sg(req->src, req->nbytes, DMA_TO_DEVICE)) {
-                       printk(KERN_ERR "%s: out of memory\n", __func__);
-                       return;
-               }
-
-               setup_data_in();
-               mv_init_hash_config(req);
-       } else {
-               copy_src_to_buf(p, ctx->buffer + old_extra_bytes,
-                               ctx->extra_bytes - old_extra_bytes);
                if (ctx->last_chunk)
                        rc = mv_hash_final_fallback(req);
                else
@@ -843,7 +821,34 @@ static void mv_start_new_hash_req(struct ahash_request 
*req)
                local_bh_disable();
                req->base.complete(&req->base, rc);
                local_bh_enable();
+               return;
        }
+
+       if (likely(req->nbytes)) {
+               BUG_ON(!req->src);
+
+               if (!mv_dma_map_sg(req->src, req->nbytes, DMA_TO_DEVICE)) {
+                       printk(KERN_ERR "%s: out of memory\n", __func__);
+                       return;
+               }
+               p->sg_src_left = sg_dma_len(req->src);
+               p->src_sg = req->src;
+       }
+
+       p->hw_nbytes = hw_bytes;
+       p->complete = mv_hash_algo_completion;
+       p->process = mv_update_hash_config;
+
+       if (unlikely(old_extra_bytes)) {
+               dma_sync_single_for_device(cpg->dev, ctx->buffer_dma,
+                               SHA1_BLOCK_SIZE, DMA_TO_DEVICE);
+               mv_dma_memcpy(cpg->sram_phys + SRAM_DATA_IN_START,
+                               ctx->buffer_dma, old_extra_bytes);
+               p->crypt_len = old_extra_bytes;
+       }
+
+       setup_data_in();
+       mv_init_hash_config(req);
 }
 
 static int queue_manag(void *data)
-- 
1.7.3.4

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html