3 files changed, 10 insertions, 2 deletions

diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c
index 612898b4aaad..9c6ff8b813d9 100644
--- a/drivers/crypto/ccp/ccp-dev-v5.c
+++ b/drivers/crypto/ccp/ccp-dev-v5.c
@@ -284,8 +284,7 @@ static int ccp5_perform_aes(struct ccp_op *op)
         CCP_AES_ENCRYPT(&function) = op->u.aes.action;
         CCP_AES_MODE(&function) = op->u.aes.mode;
         CCP_AES_TYPE(&function) = op->u.aes.type;
-        if (op->u.aes.mode == CCP_AES_MODE_CFB)
-                CCP_AES_SIZE(&function) = 0x7f;
+        CCP_AES_SIZE(&function) = op->u.aes.size;
 
         CCP5_CMD_FUNCTION(&desc) = function.raw;
 
diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h
index 649e5610a5ce..2b5c01fade05 100644
--- a/drivers/crypto/ccp/ccp-dev.h
+++ b/drivers/crypto/ccp/ccp-dev.h
@@ -467,6 +467,7 @@ struct ccp_aes_op {
         enum ccp_aes_type type;
         enum ccp_aes_mode mode;
         enum ccp_aes_action action;
+        unsigned int size;
 };
 
 struct ccp_xts_aes_op {
diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c
index 50fae4442801..6878160234b5 100644
--- a/drivers/crypto/ccp/ccp-ops.c
+++ b/drivers/crypto/ccp/ccp-ops.c
@@ -692,6 +692,14 @@ static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
                         goto e_ctx;
                 }
         }
+        switch (aes->mode) {
+        case CCP_AES_MODE_CFB: /* CFB128 only */
+        case CCP_AES_MODE_CTR:
+                op.u.aes.size = AES_BLOCK_SIZE * BITS_PER_BYTE - 1;
+                break;
+        default:
+                op.u.aes.size = 0;
+        }
 
         /* Prepare the input and output data workareas. For in-place
          * operations we need to set the dma direction to BIDIRECTIONAL