crypto: ccree - avoid implicit enum conversion

nathanchance · herbertx · commit 18e732b8035d · 2018-10-17T14:16:18.000+08:00
Clang warns when one enumerated type is implicitly converted to another and this happens in several locations in this driver, ultimately related to the set_cipher_{mode,config0} functions. set_cipher_mode expects a mode of type drv_cipher_mode and set_cipher_config0 expects a mode of type drv_crypto_direction. drivers/crypto/ccree/cc_ivgen.c:58:35: warning: implicit conversion from enumeration type 'enum cc_desc_direction' to different enumeration type 'enum drv_crypto_direction' [-Wenum-conversion] set_cipher_config0(&iv_seq[idx], DESC_DIRECTION_ENCRYPT_ENCRYPT); drivers/crypto/ccree/cc_hash.c:99:28: warning: implicit conversion from enumeration type 'enum cc_hash_conf_pad' to different enumeration type 'enum drv_crypto_direction' [-Wenum-conversion] set_cipher_config0(desc, HASH_DIGEST_RESULT_LITTLE_ENDIAN); drivers/crypto/ccree/cc_aead.c:1643:30: warning: implicit conversion from enumeration type 'enum drv_hash_hw_mode' to different enumeration type 'enum drv_cipher_mode' [-Wenum-conversion] set_cipher_mode(&desc[idx], DRV_HASH_HW_GHASH); Since this fundamentally isn't a problem because these values just represent simple integers for a shift operation, make it clear to Clang that this is okay by making the mode parameter in both functions an int. Link: ClangBuiltLinux#46 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Acked-by: Gilad Ben-Yossef <gilad@benyossef.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/drivers/crypto/ccree/cc_hw_queue_defs.h b/drivers/crypto/ccree/cc_hw_queue_defs.h
@@ -449,8 +449,7 @@ static inline void set_flow_mode(struct cc_hw_desc *pdesc,
  * @pdesc: pointer HW descriptor struct
  * @mode:  Any one of the modes defined in [CC7x-DESC]
  */
-static inline void set_cipher_mode(struct cc_hw_desc *pdesc,
-				   enum drv_cipher_mode mode)
+static inline void set_cipher_mode(struct cc_hw_desc *pdesc, int mode)
 {
 	pdesc->word[4] |= FIELD_PREP(WORD4_CIPHER_MODE, mode);
 }
@@ -461,8 +460,7 @@ static inline void set_cipher_mode(struct cc_hw_desc *pdesc,
  * @pdesc: pointer HW descriptor struct
  * @mode: Any one of the modes defined in [CC7x-DESC]
  */
-static inline void set_cipher_config0(struct cc_hw_desc *pdesc,
-				      enum drv_crypto_direction mode)
+static inline void set_cipher_config0(struct cc_hw_desc *pdesc, int mode)
 {
 	pdesc->word[4] |= FIELD_PREP(WORD4_CIPHER_CONF0, mode);
 }

Original file line number	Diff line number	Diff line change
`@@ -449,8 +449,7 @@ static inline void set_flow_mode(struct cc_hw_desc *pdesc,`
`449`	`449`	`* @pdesc: pointer HW descriptor struct`
`450`	`450`	`* @mode: Any one of the modes defined in [CC7x-DESC]`
`451`	`451`	`*/`
`452`		`-static inline void set_cipher_mode(struct cc_hw_desc *pdesc,`
`453`		`- enum drv_cipher_mode mode)`
	`452`	`+static inline void set_cipher_mode(struct cc_hw_desc *pdesc, int mode)`
`454`	`453`	`{`
`455`	`454`	`pdesc->word[4] \|= FIELD_PREP(WORD4_CIPHER_MODE, mode);`
`456`	`455`	`}`
`@@ -461,8 +460,7 @@ static inline void set_cipher_mode(struct cc_hw_desc *pdesc,`
`461`	`460`	`* @pdesc: pointer HW descriptor struct`
`462`	`461`	`* @mode: Any one of the modes defined in [CC7x-DESC]`
`463`	`462`	`*/`
`464`		`-static inline void set_cipher_config0(struct cc_hw_desc *pdesc,`
`465`		`- enum drv_crypto_direction mode)`
	`463`	`+static inline void set_cipher_config0(struct cc_hw_desc *pdesc, int mode)`
`466`	`464`	`{`
`467`	`465`	`pdesc->word[4] \|= FIELD_PREP(WORD4_CIPHER_CONF0, mode);`
`468`	`466`	`}`