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

crypto: caam - completely remove error propagation handling 



Commit 4464a7d4
("crypto: caam - remove error propagation handling")
removed error propagation handling only from caamalg.

Do this in all other places: caamhash, caamrng.
Update descriptors' lengths appropriately.

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

drivers/crypto/caam/caamhash.c

+1 −4
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
#define CAAM_MAX_HASH_DIGEST_SIZE	SHA512_DIGEST_SIZE



/* length of descriptors text */

#define DESC_AHASH_BASE			(4 * CAAM_CMD_SZ)

#define DESC_AHASH_BASE			(3 * CAAM_CMD_SZ)

#define DESC_AHASH_UPDATE_LEN		(6 * CAAM_CMD_SZ)

#define DESC_AHASH_UPDATE_FIRST_LEN	(DESC_AHASH_BASE + 4 * CAAM_CMD_SZ)

#define DESC_AHASH_FINAL_LEN		(DESC_AHASH_BASE + 5 * CAAM_CMD_SZ)
@@ -246,9 +246,6 @@ static inline void init_sh_desc_key_ahash(u32 *desc, struct caam_hash_ctx *ctx) 


		set_jump_tgt_here(desc, key_jump_cmd);

	}



	/* Propagate errors from shared to job descriptor */

	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);

}



/*

drivers/crypto/caam/caamrng.c

+1 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 


/* length of descriptors */

#define DESC_JOB_O_LEN			(CAAM_CMD_SZ * 2 + CAAM_PTR_SZ * 2)

#define DESC_RNG_LEN			(4 * CAAM_CMD_SZ)

#define DESC_RNG_LEN			(3 * CAAM_CMD_SZ)



/* Buffer, its dma address and lock */

struct buf_data {
@@ -196,9 +196,6 @@ static inline int rng_create_sh_desc(struct caam_rng_ctx *ctx) 


	init_sh_desc(desc, HDR_SHARE_SERIAL);



	/* Propagate errors from shared to job descriptor */

	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);



	/* Generate random bytes */

	append_operation(desc, OP_ALG_ALGSEL_RNG | OP_TYPE_CLASS1_ALG);

CRA Git | Maintained and supported by SUSTech CRA and CCSE