iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: ccp - Fix sparse warnings

Browse Source 
This patch fixes a number of endianness marking issues in the ccp
driver.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: John Allen <john.allen@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2020-07-03 14:46:52 +10:00
parent 662bb52f50
commit d9dd5ef3d3
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/crypto/ccp/ccp-dev-v5.c
View File

@ -221,8 +221,8 @@ static unsigned int ccp5_get_free_slots(struct ccp_cmd_queue *cmd_q)
static int ccp5_do_cmd(struct ccp5_desc *desc, static int ccp5_do_cmd(struct ccp5_desc *desc,
struct ccp_cmd_queue *cmd_q) struct ccp_cmd_queue *cmd_q)
{ {
u32 *mP; __le32 *mP;
__le32 *dP; u32 *dP;
u32 tail; u32 tail;
int i; int i;
int ret = 0; int ret = 0;
@ -235,8 +235,8 @@ static int ccp5_do_cmd(struct ccp5_desc *desc,
} }
mutex_lock(&cmd_q->q_mutex); mutex_lock(&cmd_q->q_mutex);
mP = (u32 *) &cmd_q->qbase[cmd_q->qidx]; mP = (__le32 *)&cmd_q->qbase[cmd_q->qidx];
dP = (__le32 *) desc; dP = (u32 *)desc;
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
mP[i] = cpu_to_le32(dP[i]); /* handle endianness */ mP[i] = cpu_to_le32(dP[i]); /* handle endianness */

12
drivers/crypto/ccp/ccp-dev.h
View File

@ -597,8 +597,8 @@ struct dword3 {
}; };
union dword4 { union dword4 {
__le32 dst_lo; /* NON-SHA */ u32 dst_lo; /* NON-SHA */
__le32 sha_len_lo; /* SHA */ u32 sha_len_lo; /* SHA */
}; };
union dword5 { union dword5 {
@ -608,7 +608,7 @@ union dword5 {
unsigned int rsvd1:13; unsigned int rsvd1:13;
unsigned int fixed:1; unsigned int fixed:1;
} fields; } fields;
__le32 sha_len_hi; u32 sha_len_hi;
}; };
struct dword7 { struct dword7 {
@ -619,12 +619,12 @@ struct dword7 {
struct ccp5_desc { struct ccp5_desc {
struct dword0 dw0; struct dword0 dw0;
__le32 length; u32 length;
__le32 src_lo; u32 src_lo;
struct dword3 dw3; struct dword3 dw3;
union dword4 dw4; union dword4 dw4;
union dword5 dw5; union dword5 dw5;
__le32 key_lo; u32 key_lo;
struct dword7 dw7; struct dword7 dw7;
}; };

5
drivers/crypto/ccp/ccp-ops.c
View File

@ -632,13 +632,12 @@ ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
struct ccp_data src, dst; struct ccp_data src, dst;
struct ccp_data aad; struct ccp_data aad;
struct ccp_op op; struct ccp_op op;
unsigned long long *final;
unsigned int dm_offset; unsigned int dm_offset;
unsigned int authsize; unsigned int authsize;
unsigned int jobid; unsigned int jobid;
unsigned int ilen; unsigned int ilen;
bool in_place = true; /* Default value */ bool in_place = true; /* Default value */
__be64 *final;
int ret; int ret;
struct scatterlist *p_inp, sg_inp[2]; struct scatterlist *p_inp, sg_inp[2];
@ -840,7 +839,7 @@ ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
if (ret) if (ret)
goto e_dst; goto e_dst;
final = (unsigned long long *) final_wa.address; final = (__be64 *)final_wa.address;
final[0] = cpu_to_be64(aes->aad_len * 8); final[0] = cpu_to_be64(aes->aad_len * 8);
final[1] = cpu_to_be64(ilen * 8); final[1] = cpu_to_be64(ilen * 8);