1 files changed, 33 insertions, 23 deletions

diff --git a/drivers/crypto/nx/nx-aes-cbc.c b/drivers/crypto/nx/nx-aes-cbc.c
index a9e76c6c37d8..cc00b52306ba 100644
--- a/drivers/crypto/nx/nx-aes-cbc.c
+++ b/drivers/crypto/nx/nx-aes-cbc.c
@@ -71,39 +71,49 @@ static int cbc_aes_nx_crypt(struct blkcipher_desc *desc,
         struct nx_crypto_ctx *nx_ctx = crypto_blkcipher_ctx(desc->tfm);
         struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
         unsigned long irq_flags;
+        unsigned int processed = 0, to_process;
+        u32 max_sg_len;
         int rc;
 
         spin_lock_irqsave(&nx_ctx->lock, irq_flags);
 
-        if (nbytes > nx_ctx->ap->databytelen) {
-                rc = -EINVAL;
-                goto out;
-        }
+        max_sg_len = min_t(u32, nx_driver.of.max_sg_len/sizeof(struct nx_sg),
+                           nx_ctx->ap->sglen);
 
         if (enc)
                 NX_CPB_FDM(csbcpb) |= NX_FDM_ENDE_ENCRYPT;
         else
                 NX_CPB_FDM(csbcpb) &= ~NX_FDM_ENDE_ENCRYPT;
 
-        rc = nx_build_sg_lists(nx_ctx, desc, dst, src, nbytes, 0,
-                               csbcpb->cpb.aes_cbc.iv);
-        if (rc)
-                goto out;
-
-        if (!nx_ctx->op.inlen || !nx_ctx->op.outlen) {
-                rc = -EINVAL;
-                goto out;
-        }
-
-        rc = nx_hcall_sync(nx_ctx, &nx_ctx->op,
-                           desc->flags & CRYPTO_TFM_REQ_MAY_SLEEP);
-        if (rc)
-                goto out;
-
-        memcpy(desc->info, csbcpb->cpb.aes_cbc.cv, AES_BLOCK_SIZE);
-        atomic_inc(&(nx_ctx->stats->aes_ops));
-        atomic64_add(csbcpb->csb.processed_byte_count,
-                     &(nx_ctx->stats->aes_bytes));
+        do {
+                to_process = min_t(u64, nbytes - processed,
+                                   nx_ctx->ap->databytelen);
+                to_process = min_t(u64, to_process,
+                                   NX_PAGE_SIZE * (max_sg_len - 1));
+                to_process = to_process & ~(AES_BLOCK_SIZE - 1);
+
+                rc = nx_build_sg_lists(nx_ctx, desc, dst, src, to_process,
+                                       processed, csbcpb->cpb.aes_cbc.iv);
+                if (rc)
+                        goto out;
+
+                if (!nx_ctx->op.inlen || !nx_ctx->op.outlen) {
+                        rc = -EINVAL;
+                        goto out;
+                }
+
+                rc = nx_hcall_sync(nx_ctx, &nx_ctx->op,
+                                   desc->flags & CRYPTO_TFM_REQ_MAY_SLEEP);
+                if (rc)
+                        goto out;
+
+                memcpy(desc->info, csbcpb->cpb.aes_cbc.cv, AES_BLOCK_SIZE);
+                atomic_inc(&(nx_ctx->stats->aes_ops));
+                atomic64_add(csbcpb->csb.processed_byte_count,
+                             &(nx_ctx->stats->aes_bytes));
+
+                processed += to_process;
+        } while (processed < nbytes);
 out:
         spin_unlock_irqrestore(&nx_ctx->lock, irq_flags);
         return rc;