crypto: marvell/cesa - Do not chain submitted requests

This driver tries to chain requests together before submitting them
to hardware in order to reduce completion interrupts.

However, it even extends chains that have already been submitted
to hardware.  This is dangerous because there is no way of knowing
whether the hardware has already read the DMA memory in question
or not.

Fix this by splitting the chain list into two.  One for submitted
requests and one for requests that have not yet been submitted.
Only extend the latter.

Reported-by: Klaus Kudielka <klaus.kudielka@gmail.com>
Fixes: 85030c5168f1 ("crypto: marvell - Add support for chaining crypto requests in TDMA mode")
Cc: <stable@vger.kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/marvell/cesa/cesa.c b/drivers/crypto/marvell/cesa/cesa.c
index fa08f10e6f3f2c371acadeb7e7bc554c71ba0a29..9c21f5d835d2b0d31e5ba73480440c0dd86adae3 100644 (file)
--- a/drivers/crypto/marvell/cesa/cesa.c
+++ b/drivers/crypto/marvell/cesa/cesa.c
@@ -94,7 +94,7 @@ static int mv_cesa_std_process(struct mv_cesa_engine *engine, u32 status)
 
 static int mv_cesa_int_process(struct mv_cesa_engine *engine, u32 status)
 {
-       if (engine->chain.first && engine->chain.last)
+       if (engine->chain_hw.first && engine->chain_hw.last)
                return mv_cesa_tdma_process(engine, status);
 
        return mv_cesa_std_process(engine, status);

diff --git a/drivers/crypto/marvell/cesa/cesa.h b/drivers/crypto/marvell/cesa/cesa.h
index d215a6bed6bc7b8f9abb43937651763d25f6cd6f..50ca1039fdaa7a477ce0ff23c135d20f08caea92 100644 (file)
--- a/drivers/crypto/marvell/cesa/cesa.h
+++ b/drivers/crypto/marvell/cesa/cesa.h
@@ -440,8 +440,10 @@ struct mv_cesa_dev {
  *                     SRAM
  * @queue:             fifo of the pending crypto requests
  * @load:              engine load counter, useful for load balancing
- * @chain:             list of the current tdma descriptors being processed
- *                     by this engine.
+ * @chain_hw:          list of the current tdma descriptors being processed
+ *                     by the hardware.
+ * @chain_sw:          list of the current tdma descriptors that will be
+ *                     submitted to the hardware.
  * @complete_queue:    fifo of the processed requests by the engine
  *
  * Structure storing CESA engine information.
@@ -463,7 +465,8 @@ struct mv_cesa_engine {
        struct gen_pool *pool;
        struct crypto_queue queue;
        atomic_t load;
-       struct mv_cesa_tdma_chain chain;
+       struct mv_cesa_tdma_chain chain_hw;
+       struct mv_cesa_tdma_chain chain_sw;
        struct list_head complete_queue;
        int irq;
 };

diff --git a/drivers/crypto/marvell/cesa/tdma.c b/drivers/crypto/marvell/cesa/tdma.c
index 388a06e180d64a2132ea4f4669f4cea44b882de5..243305354420c174d369fc5eaabaa5690cfb2812 100644 (file)
--- a/drivers/crypto/marvell/cesa/tdma.c
+++ b/drivers/crypto/marvell/cesa/tdma.c
@@ -38,6 +38,15 @@ void mv_cesa_dma_step(struct mv_cesa_req *dreq)
 {
        struct mv_cesa_engine *engine = dreq->engine;
 
+       spin_lock_bh(&engine->lock);
+       if (engine->chain_sw.first == dreq->chain.first) {
+               engine->chain_sw.first = NULL;
+               engine->chain_sw.last = NULL;
+       }
+       engine->chain_hw.first = dreq->chain.first;
+       engine->chain_hw.last = dreq->chain.last;
+       spin_unlock_bh(&engine->lock);
+
        writel_relaxed(0, engine->regs + CESA_SA_CFG);
 
        mv_cesa_set_int_mask(engine, CESA_SA_INT_ACC0_IDMA_DONE);
@@ -96,25 +105,27 @@ void mv_cesa_dma_prepare(struct mv_cesa_req *dreq,
 void mv_cesa_tdma_chain(struct mv_cesa_engine *engine,
                        struct mv_cesa_req *dreq)
 {
-       if (engine->chain.first == NULL && engine->chain.last == NULL) {
-               engine->chain.first = dreq->chain.first;
-               engine->chain.last  = dreq->chain.last;
-       } else {
-               struct mv_cesa_tdma_desc *last;
+       struct mv_cesa_tdma_desc *last = engine->chain_sw.last;
 
-               last = engine->chain.last;
+       /*
+        * Break the DMA chain if the request being queued needs the IV
+        * regs to be set before lauching the request.
+        */
+       if (!last || dreq->chain.first->flags & CESA_TDMA_SET_STATE)
+               engine->chain_sw.first = dreq->chain.first;
+       else {
                last->next = dreq->chain.first;
-               engine->chain.last = dreq->chain.last;
-
-               /*
-                * Break the DMA chain if the CESA_TDMA_BREAK_CHAIN is set on
-                * the last element of the current chain, or if the request
-                * being queued needs the IV regs to be set before lauching
-                * the request.
-                */
-               if (!(last->flags & CESA_TDMA_BREAK_CHAIN) &&
-                   !(dreq->chain.first->flags & CESA_TDMA_SET_STATE))
-                       last->next_dma = cpu_to_le32(dreq->chain.first->cur_dma);
+               last->next_dma = cpu_to_le32(dreq->chain.first->cur_dma);
+       }
+       last = dreq->chain.last;
+       engine->chain_sw.last = last;
+       /*
+        * Break the DMA chain if the CESA_TDMA_BREAK_CHAIN is set on
+        * the last element of the current chain.
+        */
+       if (last->flags & CESA_TDMA_BREAK_CHAIN) {
+               engine->chain_sw.first = NULL;
+               engine->chain_sw.last = NULL;
        }
 }
 
@@ -127,7 +138,7 @@ int mv_cesa_tdma_process(struct mv_cesa_engine *engine, u32 status)
 
        tdma_cur = readl(engine->regs + CESA_TDMA_CUR);
 
-       for (tdma = engine->chain.first; tdma; tdma = next) {
+       for (tdma = engine->chain_hw.first; tdma; tdma = next) {
                spin_lock_bh(&engine->lock);
                next = tdma->next;
                spin_unlock_bh(&engine->lock);
@@ -149,12 +160,12 @@ int mv_cesa_tdma_process(struct mv_cesa_engine *engine, u32 status)
                                                                 &backlog);
 
                        /* Re-chaining to the next request */
-                       engine->chain.first = tdma->next;
+                       engine->chain_hw.first = tdma->next;
                        tdma->next = NULL;
 
                        /* If this is the last request, clear the chain */
-                       if (engine->chain.first == NULL)
-                               engine->chain.last  = NULL;
+                       if (engine->chain_hw.first == NULL)
+                               engine->chain_hw.last  = NULL;
                        spin_unlock_bh(&engine->lock);
 
                        ctx = crypto_tfm_ctx(req->tfm);