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

crypto: caam - desc.h fixes 



1. fix HDR_START_IDX_MASK, HDR_SD_SHARE_MASK, HDR_JD_SHARE_MASK
Define HDR_START_IDX_MASK consistently with the other masks:
mask = bitmask << offset

2. OP_ALG_TYPE_CLASS1 and OP_ALG_TYPE_CLASS2 must be shifted.

3. fix FIFO_STORE output data type value for AFHA S-Box

4. fix OPERATION pkha modular arithmetic source mask

5. rename LDST_SRCDST_WORD_CLASS1_ICV_SZ to
LDST_SRCDST_WORD_CLASS1_IV_SZ (it refers to IV, not ICV).

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

drivers/crypto/caam/desc.h

+8 −8
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ struct sec4_sg_entry { 
#define HDR_ZRO			0x00008000



/* Start Index or SharedDesc Length */

#define HDR_START_IDX_MASK	0x3f

#define HDR_START_IDX_SHIFT	16

#define HDR_START_IDX_MASK	(0x3f << HDR_START_IDX_SHIFT)



/* If shared descriptor header, 6-bit length */

#define HDR_DESCLEN_SHR_MASK	0x3f
@@ -121,10 +121,10 @@ struct sec4_sg_entry { 
#define HDR_PROP_DNR		0x00000800



/* JobDesc/SharedDesc share property */

#define HDR_SD_SHARE_MASK	0x03

#define HDR_SD_SHARE_SHIFT	8

#define HDR_JD_SHARE_MASK	0x07

#define HDR_SD_SHARE_MASK	(0x03 << HDR_SD_SHARE_SHIFT)

#define HDR_JD_SHARE_SHIFT	8

#define HDR_JD_SHARE_MASK	(0x07 << HDR_JD_SHARE_SHIFT)



#define HDR_SHARE_NEVER		(0x00 << HDR_SD_SHARE_SHIFT)

#define HDR_SHARE_WAIT		(0x01 << HDR_SD_SHARE_SHIFT)
@@ -235,7 +235,7 @@ struct sec4_sg_entry { 
#define LDST_SRCDST_WORD_DECO_MATH2	(0x0a << LDST_SRCDST_SHIFT)

#define LDST_SRCDST_WORD_DECO_AAD_SZ	(0x0b << LDST_SRCDST_SHIFT)

#define LDST_SRCDST_WORD_DECO_MATH3	(0x0b << LDST_SRCDST_SHIFT)

#define LDST_SRCDST_WORD_CLASS1_ICV_SZ	(0x0c << LDST_SRCDST_SHIFT)

#define LDST_SRCDST_WORD_CLASS1_IV_SZ	(0x0c << LDST_SRCDST_SHIFT)

#define LDST_SRCDST_WORD_ALTDS_CLASS1	(0x0f << LDST_SRCDST_SHIFT)

#define LDST_SRCDST_WORD_PKHA_A_SZ	(0x10 << LDST_SRCDST_SHIFT)

#define LDST_SRCDST_WORD_PKHA_B_SZ	(0x11 << LDST_SRCDST_SHIFT)
@@ -400,7 +400,7 @@ struct sec4_sg_entry { 
#define FIFOST_TYPE_PKHA_N	 (0x08 << FIFOST_TYPE_SHIFT)

#define FIFOST_TYPE_PKHA_A	 (0x0c << FIFOST_TYPE_SHIFT)

#define FIFOST_TYPE_PKHA_B	 (0x0d << FIFOST_TYPE_SHIFT)

#define FIFOST_TYPE_AF_SBOX_JKEK (0x10 << FIFOST_TYPE_SHIFT)

#define FIFOST_TYPE_AF_SBOX_JKEK (0x20 << FIFOST_TYPE_SHIFT)

#define FIFOST_TYPE_AF_SBOX_TKEK (0x21 << FIFOST_TYPE_SHIFT)

#define FIFOST_TYPE_PKHA_E_JKEK	 (0x22 << FIFOST_TYPE_SHIFT)

#define FIFOST_TYPE_PKHA_E_TKEK	 (0x23 << FIFOST_TYPE_SHIFT)
@@ -1107,8 +1107,8 @@ struct sec4_sg_entry { 
/* For non-protocol/alg-only op commands */

#define OP_ALG_TYPE_SHIFT	24

#define OP_ALG_TYPE_MASK	(0x7 << OP_ALG_TYPE_SHIFT)

#define OP_ALG_TYPE_CLASS1	2

#define OP_ALG_TYPE_CLASS2	4

#define OP_ALG_TYPE_CLASS1	(2 << OP_ALG_TYPE_SHIFT)

#define OP_ALG_TYPE_CLASS2	(4 << OP_ALG_TYPE_SHIFT)



#define OP_ALG_ALGSEL_SHIFT	16

#define OP_ALG_ALGSEL_MASK	(0xff << OP_ALG_ALGSEL_SHIFT)
@@ -1249,7 +1249,7 @@ struct sec4_sg_entry { 
#define OP_ALG_PKMODE_MOD_PRIMALITY	0x00f



/* PKHA mode copy-memory functions */

#define OP_ALG_PKMODE_SRC_REG_SHIFT	13

#define OP_ALG_PKMODE_SRC_REG_SHIFT	17

#define OP_ALG_PKMODE_SRC_REG_MASK	(7 << OP_ALG_PKMODE_SRC_REG_SHIFT)

#define OP_ALG_PKMODE_DST_REG_SHIFT	10

#define OP_ALG_PKMODE_DST_REG_MASK	(7 << OP_ALG_PKMODE_DST_REG_SHIFT)

CRA Git | Maintained and supported by SUSTech CRA and CCSE