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

Commit e2d4ea94 authored by Andrei Varvara's avatar Andrei Varvara Committed by Herbert Xu
Browse files

crypto: caam - fix SEQ IN PTR command when RTO or PRE bit is set 



SEQ IN PTR command does not require pointer if RTO or PRE bit is set
Updated desc_constr.h accordingly.

Signed-off-by: default avatarAndrei Varvara <andrei.varvara@freescale.com>
Reviewed-by: default avatarPhillips Kim-R1AAHA <Kim.Phillips@freescale.com>
Reviewed-by: default avatarFleming Andrew-AFLEMING <AFLEMING@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 74d24d83

drivers/crypto/caam/desc.h

+2 −2
Original line number Diff line number Diff line
@@ -1294,10 +1294,10 @@ struct sec4_sg_entry { 
#define SQOUT_SGF	0x01000000



/* Appends to a previous pointer */

#define SQOUT_PRE	0x00800000

#define SQOUT_PRE	SQIN_PRE



/* Restore sequence with pointer/length */

#define SQOUT_RTO	0x00200000

#define SQOUT_RTO	 SQIN_RTO



/* Use extended length following pointer */

#define SQOUT_EXT	0x00400000

drivers/crypto/caam/desc_constr.h

+6 −2
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ static inline void append_cmd_ptr_extlen(u32 *desc, dma_addr_t ptr, 
					 unsigned int len, u32 command)

{

	append_cmd(desc, command);

	if (!(command & (SQIN_RTO | SQIN_PRE)))

		append_ptr(desc, ptr);

	append_cmd(desc, len);

}
@@ -186,6 +187,9 @@ static inline void append_seq_##cmd##_ptr_intlen(u32 *desc, dma_addr_t ptr, \ 
						 u32 options) \

{ \

	PRINT_POS; \

	if (options & (SQIN_RTO | SQIN_PRE)) \

		append_cmd(desc, CMD_SEQ_##op##_PTR | len | options); \

	else \

		append_cmd_ptr(desc, ptr, len, CMD_SEQ_##op##_PTR | options); \

}

APPEND_SEQ_PTR_INTLEN(in, IN)