Skip to content

Commit d128af1

Browse files
alexandru-porosanu-nxpherbertx
authored andcommitted
crypto: caam - fix AEAD givenc descriptors
The AEAD givenc descriptor relies on moving the IV through the output FIFO and then back to the CTX2 for authentication. The SEQ FIFO STORE could be scheduled before the data can be read from OFIFO, especially since the SEQ FIFO LOAD needs to wait for the SEQ FIFO LOAD SKIP to finish first. The SKIP takes more time when the input is SG than when it's a contiguous buffer. If the SEQ FIFO LOAD is not scheduled before the STORE, the DECO will hang waiting for data to be available in the OFIFO so it can be transferred to C2. In order to overcome this, first force transfer of IV to C2 by starting the "cryptlen" transfer first and then starting to store data from OFIFO to the output buffer. Fixes: 1acebad ("crypto: caam - faster aead implementation") Cc: <stable@vger.kernel.org> # 3.2+ Signed-off-by: Alex Porosanu <alexandru.porosanu@nxp.com> Signed-off-by: Horia Geantă <horia.geanta@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent d266f44 commit d128af1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/crypto/caam/caamalg.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,9 @@ static int aead_set_sh_desc(struct crypto_aead *aead)
736736

737737
/* Will read cryptlen */
738738
append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);
739-
aead_append_src_dst(desc, FIFOLD_TYPE_MSG1OUT2);
739+
append_seq_fifo_load(desc, 0, FIFOLD_CLASS_BOTH | KEY_VLF |
740+
FIFOLD_TYPE_MSG1OUT2 | FIFOLD_TYPE_LASTBOTH);
741+
append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | KEY_VLF);
740742

741743
/* Write ICV */
742744
append_seq_store(desc, ctx->authsize, LDST_CLASS_2_CCB |

0 commit comments

Comments
 (0)