leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: ccree - avoid implicit enum conversion

Browse Source 
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: https://github.com/ClangBuiltLinux/linux/issues/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>
This commit is contained in:
Nathan Chancellor 2018-10-10 14:40:07 -07:00 committed by Herbert Xu
parent 618b5dc483
commit 18e732b803
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/crypto/ccree/cc_hw_queue_defs.h
View File

@ -449,8 +449,7 @@ static inline void set_flow_mode(struct cc_hw_desc *pdesc,
* @pdesc: pointer HW descriptor struct * @pdesc: pointer HW descriptor struct
* @mode: Any one of the modes defined in [CC7x-DESC] * @mode: Any one of the modes defined in [CC7x-DESC]
*/ */
static inline void set_cipher_mode(struct cc_hw_desc *pdesc, static inline void set_cipher_mode(struct cc_hw_desc *pdesc, int mode)
enum drv_cipher_mode mode)
{ {
pdesc->word[4] |= FIELD_PREP(WORD4_CIPHER_MODE, 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 * @pdesc: pointer HW descriptor struct
* @mode: Any one of the modes defined in [CC7x-DESC] * @mode: Any one of the modes defined in [CC7x-DESC]
*/ */
static inline void set_cipher_config0(struct cc_hw_desc *pdesc, static inline void set_cipher_config0(struct cc_hw_desc *pdesc, int mode)
enum drv_crypto_direction mode)
{ {
pdesc->word[4] |= FIELD_PREP(WORD4_CIPHER_CONF0, mode); pdesc->word[4] |= FIELD_PREP(WORD4_CIPHER_CONF0, mode);
} }