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

Commit f1157a5b authored by Alex Porosanu's avatar Alex Porosanu Committed by Herbert Xu
Browse files

crypto: caam - fix RNG4 AAI defines 



RNG4 defines in desc.h were incomplete (bits AI & PS were missing),
while SK was set as an ALG related bit. This patchs adds the
missing bits and corrects the SK bit.

Signed-off-by: default avatarAlex Porosanu <alexandru.porosanu@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b1f996e0

drivers/crypto/caam/ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void build_instantiation_desc(u32 *desc) 


	/* generate secure keys (non-test) */

	append_operation(desc, OP_TYPE_CLASS1_ALG | OP_ALG_ALGSEL_RNG |

			 OP_ALG_RNG4_SK);

			 OP_ALG_AAI_RNG4_SK);



	append_jump(desc, JUMP_CLASS_CLASS1 | JUMP_TYPE_HALT);

}

drivers/crypto/caam/desc.h

+9 −8
Original line number Diff line number Diff line
@@ -1155,8 +1155,15 @@ struct sec4_sg_entry { 


/* randomizer AAI set */

#define OP_ALG_AAI_RNG		(0x00 << OP_ALG_AAI_SHIFT)

#define OP_ALG_AAI_RNG_NOZERO	(0x10 << OP_ALG_AAI_SHIFT)

#define OP_ALG_AAI_RNG_ODD	(0x20 << OP_ALG_AAI_SHIFT)

#define OP_ALG_AAI_RNG_NZB	(0x10 << OP_ALG_AAI_SHIFT)

#define OP_ALG_AAI_RNG_OBP	(0x20 << OP_ALG_AAI_SHIFT)



/* RNG4 AAI set */

#define OP_ALG_AAI_RNG4_SH_0	(0x00 << OP_ALG_AAI_SHIFT)

#define OP_ALG_AAI_RNG4_SH_1	(0x01 << OP_ALG_AAI_SHIFT)

#define OP_ALG_AAI_RNG4_PS	(0x40 << OP_ALG_AAI_SHIFT)

#define OP_ALG_AAI_RNG4_AI	(0x80 << OP_ALG_AAI_SHIFT)

#define OP_ALG_AAI_RNG4_SK	(0x100 << OP_ALG_AAI_SHIFT)



/* hmac/smac AAI set */

#define OP_ALG_AAI_HASH		(0x00 << OP_ALG_AAI_SHIFT)
@@ -1178,12 +1185,6 @@ struct sec4_sg_entry { 
#define OP_ALG_AAI_GSM		(0x10 << OP_ALG_AAI_SHIFT)

#define OP_ALG_AAI_EDGE		(0x20 << OP_ALG_AAI_SHIFT)



/* RNG4 set */

#define OP_ALG_RNG4_SHIFT	4

#define OP_ALG_RNG4_MASK	(0x1f3 << OP_ALG_RNG4_SHIFT)



#define OP_ALG_RNG4_SK		(0x100 << OP_ALG_RNG4_SHIFT)



#define OP_ALG_AS_SHIFT		2

#define OP_ALG_AS_MASK		(0x3 << OP_ALG_AS_SHIFT)

#define OP_ALG_AS_UPDATE	(0 << OP_ALG_AS_SHIFT)