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

Commit a2ecb155 authored by Kim Phillips's avatar Kim Phillips Committed by Herbert Xu
Browse files

crypto: caam - fix polarity of "propagate error" logic 



the polarity of the definition for error propagation was reverse
in the initial desc.h.  Fix desc.h and its users.

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b028b546

drivers/crypto/caam/caamalg.c

+5 −5
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static inline void append_dec_shr_done(u32 *desc) 


	jump_cmd = append_jump(desc, JUMP_CLASS_CLASS1 | JUMP_TEST_ALL);

	set_jump_tgt_here(desc, jump_cmd);

	append_cmd(desc, SET_OK_PROP_ERRORS | CMD_LOAD);

	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);

}



/*
@@ -213,7 +213,7 @@ static void init_sh_desc_key_aead(u32 *desc, struct caam_ctx *ctx, 
	set_jump_tgt_here(desc, key_jump_cmd);



	/* Propagate errors from shared to job descriptor */

	append_cmd(desc, SET_OK_PROP_ERRORS | CMD_LOAD);

	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);

}



static int aead_set_sh_desc(struct crypto_aead *aead)
@@ -310,7 +310,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) 
	/* Only propagate error immediately if shared */

	jump_cmd = append_jump(desc, JUMP_TEST_ALL);

	set_jump_tgt_here(desc, key_jump_cmd);

	append_cmd(desc, SET_OK_PROP_ERRORS | CMD_LOAD);

	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);

	set_jump_tgt_here(desc, jump_cmd);



	/* Class 2 operation */
@@ -683,7 +683,7 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 
	set_jump_tgt_here(desc, key_jump_cmd);



	/* Propagate errors from shared to job descriptor */

	append_cmd(desc, SET_OK_PROP_ERRORS | CMD_LOAD);

	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);



	/* Load iv */

	append_cmd(desc, CMD_SEQ_LOAD | LDST_SRCDST_BYTE_CONTEXT |
@@ -724,7 +724,7 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 
	/* For aead, only propagate error immediately if shared */

	jump_cmd = append_jump(desc, JUMP_TEST_ALL);

	set_jump_tgt_here(desc, key_jump_cmd);

	append_cmd(desc, SET_OK_PROP_ERRORS | CMD_LOAD);

	append_cmd(desc, SET_OK_NO_PROP_ERRORS | CMD_LOAD);

	set_jump_tgt_here(desc, jump_cmd);



	/* load IV */

drivers/crypto/caam/desc.h

+2 −2
Original line number Diff line number Diff line
@@ -233,8 +233,8 @@ 
#define LDOFF_CHG_SHARE_SHIFT		0

#define LDOFF_CHG_SHARE_MASK		(0x3 << LDOFF_CHG_SHARE_SHIFT)

#define LDOFF_CHG_SHARE_NEVER		(0x1 << LDOFF_CHG_SHARE_SHIFT)

#define LDOFF_CHG_SHARE_OK_NO_PROP	(0x2 << LDOFF_CHG_SHARE_SHIFT)

#define LDOFF_CHG_SHARE_OK_PROP		(0x3 << LDOFF_CHG_SHARE_SHIFT)

#define LDOFF_CHG_SHARE_OK_PROP		(0x2 << LDOFF_CHG_SHARE_SHIFT)

#define LDOFF_CHG_SHARE_OK_NO_PROP	(0x3 << LDOFF_CHG_SHARE_SHIFT)



#define LDOFF_ENABLE_AUTO_NFIFO		(1 << 2)

#define LDOFF_DISABLE_AUTO_NFIFO	(1 << 3)

drivers/crypto/caam/desc_constr.h

+4 −3
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ 
#define PRINT_POS

#endif



#define SET_OK_PROP_ERRORS (IMMEDIATE | LDST_CLASS_DECO | \

#define SET_OK_NO_PROP_ERRORS (IMMEDIATE | LDST_CLASS_DECO | \

			       LDST_SRCDST_WORD_DECOCTRL | \

			    (LDOFF_CHG_SHARE_OK_PROP << LDST_OFFSET_SHIFT))

			       (LDOFF_CHG_SHARE_OK_NO_PROP << \

				LDST_OFFSET_SHIFT))

#define DISABLE_AUTO_INFO_FIFO (IMMEDIATE | LDST_CLASS_DECO | \

				LDST_SRCDST_WORD_DECOCTRL | \

				(LDOFF_DISABLE_AUTO_NFIFO << LDST_OFFSET_SHIFT))