Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2106476 authored by Horia Geantă's avatar Horia Geantă Committed by Herbert Xu
Browse files

crypto: caam - fix rfc4543 descriptors 



In some cases the CCB DMA-based internal transfer started by the MOVE
command (src=M3 register, dst=descriptor buffer) does not finish
in time and DECO executes the unpatched descriptor.
This leads eventually to a DECO Watchdog Timer timeout error.

To make sure the transfer ends, change the MOVE command to be blocking.

Signed-off-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 06d44c91

drivers/crypto/caam/caamalg_desc.c

+2 −2
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ void cnstr_shdsc_rfc4543_encap(u32 * const desc, struct alginfo *cdata, 
	read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF | MOVE_DEST_MATH3 |

				    (0x6 << MOVE_LEN_SHIFT));

	write_move_cmd = append_move(desc, MOVE_SRC_MATH3 | MOVE_DEST_DESCBUF |

				     (0x8 << MOVE_LEN_SHIFT));

				     (0x8 << MOVE_LEN_SHIFT) | MOVE_WAITCOMP);



	/* Will read assoclen + cryptlen bytes */

	append_math_sub(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ);
@@ -1178,7 +1178,7 @@ void cnstr_shdsc_rfc4543_decap(u32 * const desc, struct alginfo *cdata, 
	read_move_cmd = append_move(desc, MOVE_SRC_DESCBUF | MOVE_DEST_MATH3 |

				    (0x6 << MOVE_LEN_SHIFT));

	write_move_cmd = append_move(desc, MOVE_SRC_MATH3 | MOVE_DEST_DESCBUF |

				     (0x8 << MOVE_LEN_SHIFT));

				     (0x8 << MOVE_LEN_SHIFT) | MOVE_WAITCOMP);



	/* Will read assoclen + cryptlen bytes */

	append_math_sub(desc, VARSEQINLEN, SEQOUTLEN, REG0, CAAM_CMD_SZ);