Commit a05b1c15 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: octeontx - Fix sparse warnings 



This patch fixes all the sparse warnings in the octeontx driver.
Some of these are just trivial type changes.

However, some of the changes are non-trivial on little-endian hosts.
Obviously the driver appears to be broken on either LE or BE as it
was doing different things.  I've taken the BE behaviour as the
correct one.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 864c2d57

drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c

+4 −4
Original line number Diff line number Diff line
@@ -878,11 +878,11 @@ static int copy_ucode_to_dma_mem(struct device *dev, 


	/* Byte swap 64-bit */

	for (i = 0; i < (ucode->size / 8); i++)

		((u64 *)ucode->align_va)[i] =

		((__be64 *)ucode->align_va)[i] =

				cpu_to_be64(((u64 *)ucode->align_va)[i]);

	/*  Ucode needs 16-bit swap */

	for (i = 0; i < (ucode->size / 2); i++)

		((u16 *)ucode->align_va)[i] =

		((__be16 *)ucode->align_va)[i] =

				cpu_to_be16(((u16 *)ucode->align_va)[i]);

	return 0;

}
@@ -1463,8 +1463,8 @@ int otx_cpt_try_create_default_eng_grps(struct pci_dev *pdev, 
					struct otx_cpt_eng_grps *eng_grps,

					int pf_type)

{

	struct tar_ucode_info_t *tar_info[OTX_CPT_MAX_ETYPES_PER_GRP] = { 0 };

	struct otx_cpt_engines engs[OTX_CPT_MAX_ETYPES_PER_GRP] = { {0} };

	struct tar_ucode_info_t *tar_info[OTX_CPT_MAX_ETYPES_PER_GRP] = {};

	struct otx_cpt_engines engs[OTX_CPT_MAX_ETYPES_PER_GRP] = {};

	struct tar_arch_info_t *tar_arch = NULL;

	char *tar_filename;

	int i, ret = 0;

drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ struct otx_cpt_ucode_ver_num { 
struct otx_cpt_ucode_hdr {

	struct otx_cpt_ucode_ver_num ver_num;

	u8 ver_str[OTX_CPT_UCODE_VER_STR_SZ];

	u32 code_length;

	__be32 code_length;

	u32 padding[3];

};

drivers/crypto/marvell/octeontx/otx_cptvf_algs.c

+8 −13
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ static inline u32 create_ctx_hdr(struct skcipher_request *req, u32 enc, 
	struct otx_cpt_fc_ctx *fctx = &rctx->fctx;

	int ivsize = crypto_skcipher_ivsize(stfm);

	u32 start = req->cryptlen - ivsize;

	u64 *ctrl_flags = NULL;

	gfp_t flags;



	flags = (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ?
@@ -280,8 +279,7 @@ static inline u32 create_ctx_hdr(struct skcipher_request *req, u32 enc, 


	memcpy(fctx->enc.encr_iv, req->iv, crypto_skcipher_ivsize(stfm));



	ctrl_flags = (u64 *)&fctx->enc.enc_ctrl.flags;

	*ctrl_flags = cpu_to_be64(*ctrl_flags);

	fctx->enc.enc_ctrl.flags = cpu_to_be64(fctx->enc.enc_ctrl.cflags);



	/*

	 * Storing  Packet Data Information in offset
@@ -692,20 +690,17 @@ static struct otx_cpt_sdesc *alloc_sdesc(struct crypto_shash *alg) 


static inline void swap_data32(void *buf, u32 len)

{

	u32 *store = (u32 *) buf;

	int i = 0;



	for (i = 0 ; i < len/sizeof(u32); i++, store++)

		*store = cpu_to_be32(*store);

	cpu_to_be32_array(buf, buf, len / 4);

}



static inline void swap_data64(void *buf, u32 len)

{

	u64 *store = (u64 *) buf;

	__be64 *dst = buf;

	u64 *src = buf;

	int i = 0;



	for (i = 0 ; i < len/sizeof(u64); i++, store++)

		*store = cpu_to_be64(*store);

	for (i = 0 ; i < len / 8; i++, src++, dst++)

		*dst = cpu_to_be64p(src);

}



static int copy_pad(u8 mac_type, u8 *out_pad, u8 *in_pad)
@@ -1012,7 +1007,7 @@ static inline u32 create_aead_ctx_hdr(struct aead_request *req, u32 enc, 
		/* Unknown cipher type */

		return -EINVAL;

	}

	rctx->ctrl_word.flags = cpu_to_be64(rctx->ctrl_word.flags);

	rctx->ctrl_word.flags = cpu_to_be64(rctx->ctrl_word.cflags);



	req_info->ctrl.s.dma_mode = OTX_CPT_DMA_GATHER_SCATTER;

	req_info->ctrl.s.se_req = OTX_CPT_SE_CORE_REQ;
@@ -1032,7 +1027,7 @@ static inline u32 create_aead_ctx_hdr(struct aead_request *req, u32 enc, 
	fctx->enc.enc_ctrl.e.aes_key = ctx->key_type;

	fctx->enc.enc_ctrl.e.mac_type = ctx->mac_type;

	fctx->enc.enc_ctrl.e.mac_len = mac_len;

	fctx->enc.enc_ctrl.flags = cpu_to_be64(fctx->enc.enc_ctrl.flags);

	fctx->enc.enc_ctrl.flags = cpu_to_be64(fctx->enc.enc_ctrl.cflags);



	/*

	 * Storing Packet Data Information in offset

drivers/crypto/marvell/octeontx/otx_cptvf_algs.h

+4 −2
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ enum otx_cpt_aes_key_len { 
};



union otx_cpt_encr_ctrl {

	u64 flags;

	__be64 flags;

	u64 cflags;

	struct {

#if defined(__BIG_ENDIAN_BITFIELD)

		u64 enc_cipher:4;
@@ -138,7 +139,8 @@ struct otx_cpt_des3_ctx { 
};



union otx_cpt_offset_ctrl_word {

	u64 flags;

	__be64 flags;

	u64 cflags;

	struct {

#if defined(__BIG_ENDIAN_BITFIELD)

		u64 reserved:32;

drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c

+3 −6
Original line number Diff line number Diff line
@@ -202,11 +202,10 @@ static inline int setup_sgio_list(struct pci_dev *pdev, 
	info->dlen = dlen;

	info->in_buffer = (u8 *)info + info_len;



	((u16 *)info->in_buffer)[0] = req->outcnt;

	((u16 *)info->in_buffer)[1] = req->incnt;

	((__be16 *)info->in_buffer)[0] = cpu_to_be16(req->outcnt);

	((__be16 *)info->in_buffer)[1] = cpu_to_be16(req->incnt);

	((u16 *)info->in_buffer)[2] = 0;

	((u16 *)info->in_buffer)[3] = 0;

	*(u64 *)info->in_buffer = cpu_to_be64p((u64 *)info->in_buffer);



	/* Setup gather (input) components */

	if (setup_sgio_components(pdev, req->in, req->incnt,
@@ -367,8 +366,6 @@ static int process_request(struct pci_dev *pdev, struct otx_cpt_req_info *req, 
	iq_cmd.cmd.s.param2 = cpu_to_be16(cpt_req->param2);

	iq_cmd.cmd.s.dlen   = cpu_to_be16(cpt_req->dlen);



	/* 64-bit swap for microcode data reads, not needed for addresses*/

	iq_cmd.cmd.u64 = cpu_to_be64(iq_cmd.cmd.u64);

	iq_cmd.dptr = info->dptr_baddr;

	iq_cmd.rptr = info->rptr_baddr;

	iq_cmd.cptr.u64 = 0;
@@ -436,7 +433,7 @@ static int cpt_process_ccode(struct pci_dev *pdev, 
	u8 ccode = cpt_status->s.compcode;

	union otx_cpt_error_code ecode;



	ecode.u = be64_to_cpu(*((u64 *) cpt_info->out_buffer));

	ecode.u = be64_to_cpup((__be64 *)cpt_info->out_buffer);

	switch (ccode) {

	case CPT_COMP_E_FAULT:

		dev_err(&pdev->dev,