3 files changed, 33 insertions, 9 deletions

diff --git a/drivers/crypto/marvell/cesa.h b/drivers/crypto/marvell/cesa.h
index b60698b30d30..bc2a55bc35e4 100644
--- a/drivers/crypto/marvell/cesa.h
+++ b/drivers/crypto/marvell/cesa.h
@@ -687,6 +687,33 @@ static inline u32 mv_cesa_get_int_mask(struct mv_cesa_engine *engine)
 
 int mv_cesa_queue_req(struct crypto_async_request *req);
 
+/*
+ * Helper function that indicates whether a crypto request needs to be
+ * cleaned up or not after being enqueued using mv_cesa_queue_req().
+ */
+static inline int mv_cesa_req_needs_cleanup(struct crypto_async_request *req,
+                                            int ret)
+{
+        /*
+         * The queue still had some space, the request was queued
+         * normally, so there's no need to clean it up.
+         */
+        if (ret == -EINPROGRESS)
+                return false;
+
+        /*
+         * The queue had not space left, but since the request is
+         * flagged with CRYPTO_TFM_REQ_MAY_BACKLOG, it was added to
+         * the backlog and will be processed later. There's no need to
+         * clean it up.
+         */
+        if (ret == -EBUSY && req->flags & CRYPTO_TFM_REQ_MAY_BACKLOG)
+                return false;
+
+        /* Request wasn't queued, we need to clean it up */
+        return true;
+}
+
 /* TDMA functions */
 
 static inline void mv_cesa_req_dma_iter_init(struct mv_cesa_dma_iter *iter,
diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c
index 0745cf3b9c0e..3df2f4e7adb2 100644
--- a/drivers/crypto/marvell/cipher.c
+++ b/drivers/crypto/marvell/cipher.c
@@ -189,7 +189,6 @@ static inline void mv_cesa_ablkcipher_prepare(struct crypto_async_request *req,
 {
         struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);
         struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(ablkreq);
-
         creq->req.base.engine = engine;
 
         if (creq->req.base.type == CESA_DMA_REQ)
@@ -431,7 +430,7 @@ static int mv_cesa_des_op(struct ablkcipher_request *req,
                 return ret;
 
         ret = mv_cesa_queue_req(&req->base);
-        if (ret && ret != -EINPROGRESS)
+        if (mv_cesa_req_needs_cleanup(&req->base, ret))
                 mv_cesa_ablkcipher_cleanup(req);
 
         return ret;
@@ -551,7 +550,7 @@ static int mv_cesa_des3_op(struct ablkcipher_request *req,
                 return ret;
 
         ret = mv_cesa_queue_req(&req->base);
-        if (ret && ret != -EINPROGRESS)
+        if (mv_cesa_req_needs_cleanup(&req->base, ret))
                 mv_cesa_ablkcipher_cleanup(req);
 
         return ret;
@@ -693,7 +692,7 @@ static int mv_cesa_aes_op(struct ablkcipher_request *req,
                 return ret;
 
         ret = mv_cesa_queue_req(&req->base);
-        if (ret && ret != -EINPROGRESS)
+        if (mv_cesa_req_needs_cleanup(&req->base, ret))
                 mv_cesa_ablkcipher_cleanup(req);
 
         return ret;
diff --git a/drivers/crypto/marvell/hash.c b/drivers/crypto/marvell/hash.c
index ae9272eb9c1a..e8d0d7128137 100644
--- a/drivers/crypto/marvell/hash.c
+++ b/drivers/crypto/marvell/hash.c
@@ -739,10 +739,8 @@ static int mv_cesa_ahash_update(struct ahash_request *req)
                 return 0;
 
         ret = mv_cesa_queue_req(&req->base);
-        if (ret && ret != -EINPROGRESS) {
+        if (mv_cesa_req_needs_cleanup(&req->base, ret))
                 mv_cesa_ahash_cleanup(req);
-                return ret;
-        }
 
         return ret;
 }
@@ -766,7 +764,7 @@ static int mv_cesa_ahash_final(struct ahash_request *req)
                 return 0;
 
         ret = mv_cesa_queue_req(&req->base);
-        if (ret && ret != -EINPROGRESS)
+        if (mv_cesa_req_needs_cleanup(&req->base, ret))
                 mv_cesa_ahash_cleanup(req);
 
         return ret;
@@ -791,7 +789,7 @@ static int mv_cesa_ahash_finup(struct ahash_request *req)
                 return 0;
 
         ret = mv_cesa_queue_req(&req->base);
-        if (ret && ret != -EINPROGRESS)
+        if (mv_cesa_req_needs_cleanup(&req->base, ret))
                 mv_cesa_ahash_cleanup(req);
 
         return ret;