Commit 42886fab authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman

staging: ccree: CamelCase to snake_case in func vars

Turn local vars and function parameters names in CamelCase
to snake_case.
Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0fca74fb
...@@ -308,7 +308,7 @@ static int xcbc_setkey(struct cc_hw_desc *desc, struct ssi_aead_ctx *ctx) ...@@ -308,7 +308,7 @@ static int xcbc_setkey(struct cc_hw_desc *desc, struct ssi_aead_ctx *ctx)
static int hmac_setkey(struct cc_hw_desc *desc, struct ssi_aead_ctx *ctx) static int hmac_setkey(struct cc_hw_desc *desc, struct ssi_aead_ctx *ctx)
{ {
unsigned int hmacPadConst[2] = { HMAC_IPAD_CONST, HMAC_OPAD_CONST }; unsigned int hmac_pad_const[2] = { HMAC_IPAD_CONST, HMAC_OPAD_CONST };
unsigned int digest_ofs = 0; unsigned int digest_ofs = 0;
unsigned int hash_mode = (ctx->auth_mode == DRV_HASH_SHA1) ? unsigned int hash_mode = (ctx->auth_mode == DRV_HASH_SHA1) ?
DRV_HASH_HW_SHA1 : DRV_HASH_HW_SHA256; DRV_HASH_HW_SHA1 : DRV_HASH_HW_SHA256;
...@@ -342,7 +342,7 @@ static int hmac_setkey(struct cc_hw_desc *desc, struct ssi_aead_ctx *ctx) ...@@ -342,7 +342,7 @@ static int hmac_setkey(struct cc_hw_desc *desc, struct ssi_aead_ctx *ctx)
/* Prepare ipad key */ /* Prepare ipad key */
hw_desc_init(&desc[idx]); hw_desc_init(&desc[idx]);
set_xor_val(&desc[idx], hmacPadConst[i]); set_xor_val(&desc[idx], hmac_pad_const[i]);
set_cipher_mode(&desc[idx], hash_mode); set_cipher_mode(&desc[idx], hash_mode);
set_flow_mode(&desc[idx], S_DIN_to_HASH); set_flow_mode(&desc[idx], S_DIN_to_HASH);
set_setup_mode(&desc[idx], SETUP_LOAD_STATE1); set_setup_mode(&desc[idx], SETUP_LOAD_STATE1);
...@@ -1380,27 +1380,27 @@ static int validate_data_size(struct ssi_aead_ctx *ctx, ...@@ -1380,27 +1380,27 @@ static int validate_data_size(struct ssi_aead_ctx *ctx,
} }
#if SSI_CC_HAS_AES_CCM #if SSI_CC_HAS_AES_CCM
static unsigned int format_ccm_a0(u8 *pA0Buff, u32 headerSize) static unsigned int format_ccm_a0(u8 *pa0_buff, u32 header_size)
{ {
unsigned int len = 0; unsigned int len = 0;
if (headerSize == 0) if (header_size == 0)
return 0; return 0;
if (headerSize < ((1UL << 16) - (1UL << 8))) { if (header_size < ((1UL << 16) - (1UL << 8))) {
len = 2; len = 2;
pA0Buff[0] = (headerSize >> 8) & 0xFF; pa0_buff[0] = (header_size >> 8) & 0xFF;
pA0Buff[1] = headerSize & 0xFF; pa0_buff[1] = header_size & 0xFF;
} else { } else {
len = 6; len = 6;
pA0Buff[0] = 0xFF; pa0_buff[0] = 0xFF;
pA0Buff[1] = 0xFE; pa0_buff[1] = 0xFE;
pA0Buff[2] = (headerSize >> 24) & 0xFF; pa0_buff[2] = (header_size >> 24) & 0xFF;
pA0Buff[3] = (headerSize >> 16) & 0xFF; pa0_buff[3] = (header_size >> 16) & 0xFF;
pA0Buff[4] = (headerSize >> 8) & 0xFF; pa0_buff[4] = (header_size >> 8) & 0xFF;
pA0Buff[5] = headerSize & 0xFF; pa0_buff[5] = header_size & 0xFF;
} }
return len; return len;
......
...@@ -182,8 +182,8 @@ static inline int ssi_buffer_mgr_render_buff_to_mlli( ...@@ -182,8 +182,8 @@ static inline int ssi_buffer_mgr_render_buff_to_mlli(
} }
static inline int ssi_buffer_mgr_render_scatterlist_to_mlli( static inline int ssi_buffer_mgr_render_scatterlist_to_mlli(
struct scatterlist *sgl, u32 sgl_data_len, u32 sglOffset, u32 *curr_nents, struct scatterlist *sgl, u32 sgl_data_len, u32 sgl_offset,
u32 **mlli_entry_pp) u32 *curr_nents, u32 **mlli_entry_pp)
{ {
struct scatterlist *curr_sgl = sgl; struct scatterlist *curr_sgl = sgl;
u32 *mlli_entry_p = *mlli_entry_pp; u32 *mlli_entry_p = *mlli_entry_pp;
...@@ -192,16 +192,17 @@ static inline int ssi_buffer_mgr_render_scatterlist_to_mlli( ...@@ -192,16 +192,17 @@ static inline int ssi_buffer_mgr_render_scatterlist_to_mlli(
for ( ; (curr_sgl) && (sgl_data_len != 0); for ( ; (curr_sgl) && (sgl_data_len != 0);
curr_sgl = sg_next(curr_sgl)) { curr_sgl = sg_next(curr_sgl)) {
u32 entry_data_len = u32 entry_data_len =
(sgl_data_len > sg_dma_len(curr_sgl) - sglOffset) ? (sgl_data_len > sg_dma_len(curr_sgl) - sgl_offset) ?
sg_dma_len(curr_sgl) - sglOffset : sgl_data_len; sg_dma_len(curr_sgl) - sgl_offset :
sgl_data_len;
sgl_data_len -= entry_data_len; sgl_data_len -= entry_data_len;
rc = ssi_buffer_mgr_render_buff_to_mlli( rc = ssi_buffer_mgr_render_buff_to_mlli(
sg_dma_address(curr_sgl) + sglOffset, entry_data_len, curr_nents, sg_dma_address(curr_sgl) + sgl_offset, entry_data_len,
&mlli_entry_p); curr_nents, &mlli_entry_p);
if (rc != 0) if (rc != 0)
return rc; return rc;
sglOffset = 0; sgl_offset = 0;
} }
*mlli_entry_pp = mlli_entry_p; *mlli_entry_pp = mlli_entry_p;
return 0; return 0;
......
...@@ -967,7 +967,7 @@ static int ssi_hash_setkey(void *hash, ...@@ -967,7 +967,7 @@ static int ssi_hash_setkey(void *hash,
unsigned int keylen, unsigned int keylen,
bool synchronize) bool synchronize)
{ {
unsigned int hmacPadConst[2] = { HMAC_IPAD_CONST, HMAC_OPAD_CONST }; unsigned int hmac_pad_const[2] = { HMAC_IPAD_CONST, HMAC_OPAD_CONST };
struct ssi_crypto_req ssi_req = {}; struct ssi_crypto_req ssi_req = {};
struct ssi_hash_ctx *ctx = NULL; struct ssi_hash_ctx *ctx = NULL;
int blocksize = 0; int blocksize = 0;
...@@ -1108,7 +1108,7 @@ static int ssi_hash_setkey(void *hash, ...@@ -1108,7 +1108,7 @@ static int ssi_hash_setkey(void *hash,
/* Prepare ipad key */ /* Prepare ipad key */
hw_desc_init(&desc[idx]); hw_desc_init(&desc[idx]);
set_xor_val(&desc[idx], hmacPadConst[i]); set_xor_val(&desc[idx], hmac_pad_const[i]);
set_cipher_mode(&desc[idx], ctx->hw_mode); set_cipher_mode(&desc[idx], ctx->hw_mode);
set_flow_mode(&desc[idx], S_DIN_to_HASH); set_flow_mode(&desc[idx], S_DIN_to_HASH);
set_setup_mode(&desc[idx], SETUP_LOAD_STATE1); set_setup_mode(&desc[idx], SETUP_LOAD_STATE1);
...@@ -1441,18 +1441,19 @@ static int ssi_mac_final(struct ahash_request *req) ...@@ -1441,18 +1441,19 @@ static int ssi_mac_final(struct ahash_request *req)
struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN]; struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
int idx = 0; int idx = 0;
int rc = 0; int rc = 0;
u32 keySize, keyLen; u32 key_size, key_len;
u32 digestsize = crypto_ahash_digestsize(tfm); u32 digestsize = crypto_ahash_digestsize(tfm);
u32 rem_cnt = state->buff_index ? state->buff1_cnt : u32 rem_cnt = state->buff_index ? state->buff1_cnt :
state->buff0_cnt; state->buff0_cnt;
if (ctx->hw_mode == DRV_CIPHER_XCBC_MAC) { if (ctx->hw_mode == DRV_CIPHER_XCBC_MAC) {
keySize = CC_AES_128_BIT_KEY_SIZE; key_size = CC_AES_128_BIT_KEY_SIZE;
keyLen = CC_AES_128_BIT_KEY_SIZE; key_len = CC_AES_128_BIT_KEY_SIZE;
} else { } else {
keySize = (ctx->key_params.keylen == 24) ? AES_MAX_KEY_SIZE : ctx->key_params.keylen; key_size = (ctx->key_params.keylen == 24) ? AES_MAX_KEY_SIZE :
keyLen = ctx->key_params.keylen; ctx->key_params.keylen;
key_len = ctx->key_params.keylen;
} }
SSI_LOG_DEBUG("===== final xcbc reminder (%d) ====\n", rem_cnt); SSI_LOG_DEBUG("===== final xcbc reminder (%d) ====\n", rem_cnt);
...@@ -1478,8 +1479,8 @@ static int ssi_mac_final(struct ahash_request *req) ...@@ -1478,8 +1479,8 @@ static int ssi_mac_final(struct ahash_request *req)
set_cipher_config0(&desc[idx], DRV_CRYPTO_DIRECTION_DECRYPT); set_cipher_config0(&desc[idx], DRV_CRYPTO_DIRECTION_DECRYPT);
set_din_type(&desc[idx], DMA_DLLI, set_din_type(&desc[idx], DMA_DLLI,
(ctx->opad_tmp_keys_dma_addr + (ctx->opad_tmp_keys_dma_addr +
XCBC_MAC_K1_OFFSET), keySize, NS_BIT); XCBC_MAC_K1_OFFSET), key_size, NS_BIT);
set_key_size_aes(&desc[idx], keyLen); set_key_size_aes(&desc[idx], key_len);
set_flow_mode(&desc[idx], S_DIN_to_AES); set_flow_mode(&desc[idx], S_DIN_to_AES);
set_setup_mode(&desc[idx], SETUP_LOAD_KEY0); set_setup_mode(&desc[idx], SETUP_LOAD_KEY0);
idx++; idx++;
...@@ -1508,7 +1509,7 @@ static int ssi_mac_final(struct ahash_request *req) ...@@ -1508,7 +1509,7 @@ static int ssi_mac_final(struct ahash_request *req)
if (state->xcbc_count == 0) { if (state->xcbc_count == 0) {
hw_desc_init(&desc[idx]); hw_desc_init(&desc[idx]);
set_cipher_mode(&desc[idx], ctx->hw_mode); set_cipher_mode(&desc[idx], ctx->hw_mode);
set_key_size_aes(&desc[idx], keyLen); set_key_size_aes(&desc[idx], key_len);
set_cmac_size0_mode(&desc[idx]); set_cmac_size0_mode(&desc[idx]);
set_flow_mode(&desc[idx], S_DIN_to_AES); set_flow_mode(&desc[idx], S_DIN_to_AES);
idx++; idx++;
...@@ -1621,7 +1622,7 @@ static int ssi_mac_digest(struct ahash_request *req) ...@@ -1621,7 +1622,7 @@ static int ssi_mac_digest(struct ahash_request *req)
u32 digestsize = crypto_ahash_digestsize(tfm); u32 digestsize = crypto_ahash_digestsize(tfm);
struct ssi_crypto_req ssi_req = {}; struct ssi_crypto_req ssi_req = {};
struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN]; struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
u32 keyLen; u32 key_len;
int idx = 0; int idx = 0;
int rc; int rc;
...@@ -1646,17 +1647,17 @@ static int ssi_mac_digest(struct ahash_request *req) ...@@ -1646,17 +1647,17 @@ static int ssi_mac_digest(struct ahash_request *req)
ssi_req.user_arg = (void *)req; ssi_req.user_arg = (void *)req;
if (ctx->hw_mode == DRV_CIPHER_XCBC_MAC) { if (ctx->hw_mode == DRV_CIPHER_XCBC_MAC) {
keyLen = CC_AES_128_BIT_KEY_SIZE; key_len = CC_AES_128_BIT_KEY_SIZE;
ssi_hash_create_xcbc_setup(req, desc, &idx); ssi_hash_create_xcbc_setup(req, desc, &idx);
} else { } else {
keyLen = ctx->key_params.keylen; key_len = ctx->key_params.keylen;
ssi_hash_create_cmac_setup(req, desc, &idx); ssi_hash_create_cmac_setup(req, desc, &idx);
} }
if (req->nbytes == 0) { if (req->nbytes == 0) {
hw_desc_init(&desc[idx]); hw_desc_init(&desc[idx]);
set_cipher_mode(&desc[idx], ctx->hw_mode); set_cipher_mode(&desc[idx], ctx->hw_mode);
set_key_size_aes(&desc[idx], keyLen); set_key_size_aes(&desc[idx], key_len);
set_cmac_size0_mode(&desc[idx]); set_cmac_size0_mode(&desc[idx]);
set_flow_mode(&desc[idx], S_DIN_to_AES); set_flow_mode(&desc[idx], S_DIN_to_AES);
idx++; idx++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment