Re: [PATCH] crypto: hisilicon/zip - some misc cleanup

[Yang Shen]

Sorry for sending the wrong patch, please ignore this.

On 2022/8/13 17:58, Yang Shen wrote:
> Some cleanup for
>
> Signed-off-by: Yang Shen <shenyang39@xxxxxxxxxx>
> ---
>  drivers/crypto/hisilicon/zip/zip.h        |  2 +-
>  drivers/crypto/hisilicon/zip/zip_crypto.c | 30 +++++++++++------------
>  drivers/crypto/hisilicon/zip/zip_main.c   | 10 +++++---
>  3 files changed, 23 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/crypto/hisilicon/zip/zip.h b/drivers/crypto/hisilicon/zip/zip.h
> index 3dfd3bac5a33..f289656e9ac0 100644
> --- a/drivers/crypto/hisilicon/zip/zip.h
> +++ b/drivers/crypto/hisilicon/zip/zip.h
> @@ -81,7 +81,7 @@ struct hisi_zip_sqe {
>  	u32 rsvd1[4];
>  };
>
> -int zip_create_qps(struct hisi_qp **qps, int ctx_num, int node);
> +int zip_create_qps(struct hisi_qp **qps, int qp_num, int node);
>  int hisi_zip_register_to_crypto(struct hisi_qm *qm);
>  void hisi_zip_unregister_from_crypto(struct hisi_qm *qm);
>  #endif
> diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.c b/drivers/crypto/hisilicon/zip/zip_crypto.c
> index ad35434a3fdb..09a823dbf7bc 100644
> --- a/drivers/crypto/hisilicon/zip/zip_crypto.c
> +++ b/drivers/crypto/hisilicon/zip/zip_crypto.c
> @@ -135,7 +135,7 @@ static u16 sgl_sge_nr = HZIP_SGL_SGE_NR;
>  module_param_cb(sgl_sge_nr, &sgl_sge_nr_ops, &sgl_sge_nr, 0444);
>  MODULE_PARM_DESC(sgl_sge_nr, "Number of sge in sgl(1-255)");
>
> -static u16 get_extra_field_size(const u8 *start)
> +static u32 get_extra_field_size(const u8 *start)
>  {
>  	return *((u16 *)start) + GZIP_HEAD_FEXTRA_XLEN;
>  }
> @@ -167,7 +167,7 @@ static u32 __get_gzip_head_size(const u8 *src)
>  	return size;
>  }
>
> -static size_t __maybe_unused get_gzip_head_size(struct scatterlist *sgl)
> +static u32 __maybe_unused get_gzip_head_size(struct scatterlist *sgl)
>  {
>  	char buf[HZIP_GZIP_HEAD_BUF];
>
> @@ -498,7 +498,7 @@ static int hisi_zip_adecompress(struct acomp_req *acomp_req)
>  	return ret;
>  }
>
> -static int hisi_zip_start_qp(struct hisi_qp *qp, struct hisi_zip_qp_ctx *ctx,
> +static int hisi_zip_start_qp(struct hisi_qp *qp, struct hisi_zip_qp_ctx *qp_ctx,
>  			     int alg_type, int req_type)
>  {
>  	struct device *dev = &qp->qm->pdev->dev;
> @@ -506,7 +506,7 @@ static int hisi_zip_start_qp(struct hisi_qp *qp, struct hisi_zip_qp_ctx *ctx,
>
>  	qp->req_type = req_type;
>  	qp->alg_type = alg_type;
> -	qp->qp_ctx = ctx;
> +	qp->qp_ctx = qp_ctx;
>
>  	ret = hisi_qm_start_qp(qp, 0);
>  	if (ret < 0) {
> @@ -514,15 +514,15 @@ static int hisi_zip_start_qp(struct hisi_qp *qp, struct hisi_zip_qp_ctx *ctx,
>  		return ret;
>  	}
>
> -	ctx->qp = qp;
> +	qp_ctx->qp = qp;
>
>  	return 0;
>  }
>
> -static void hisi_zip_release_qp(struct hisi_zip_qp_ctx *ctx)
> +static void hisi_zip_release_qp(struct hisi_zip_qp_ctx *qp_ctx)
>  {
> -	hisi_qm_stop_qp(ctx->qp);
> -	hisi_qm_free_qps(&ctx->qp, 1);
> +	hisi_qm_stop_qp(qp_ctx->qp);
> +	hisi_qm_free_qps(&qp_ctx->qp, 1);
>  }
>
>  static const struct hisi_zip_sqe_ops hisi_zip_ops_v1 = {
> @@ -594,7 +594,7 @@ static void hisi_zip_ctx_exit(struct hisi_zip_ctx *hisi_zip_ctx)
>  {
>  	int i;
>
> -	for (i = 1; i >= 0; i--)
> +	for (i = 0; i < HZIP_CTX_Q_NUM; i++)
>  		hisi_zip_release_qp(&hisi_zip_ctx->qp_ctx[i]);
>  }
>
> @@ -613,7 +613,7 @@ static int hisi_zip_create_req_q(struct hisi_zip_ctx *ctx)
>  			if (i == 0)
>  				return ret;
>
> -			goto err_free_loop0;
> +			goto err_free_comp_q;
>  		}
>  		rwlock_init(&req_q->req_lock);
>
> @@ -622,19 +622,19 @@ static int hisi_zip_create_req_q(struct hisi_zip_ctx *ctx)
>  		if (!req_q->q) {
>  			ret = -ENOMEM;
>  			if (i == 0)
> -				goto err_free_bitmap;
> +				goto err_free_comp_bitmap;
>  			else
> -				goto err_free_loop1;
> +				goto err_free_decomp_bitmap;
>  		}
>  	}
>
>  	return 0;
>
> -err_free_loop1:
> +err_free_decomp_bitmap:
>  	bitmap_free(ctx->qp_ctx[HZIP_QPC_DECOMP].req_q.req_bitmap);
> -err_free_loop0:
> +err_free_comp_q:
>  	kfree(ctx->qp_ctx[HZIP_QPC_COMP].req_q.q);
> -err_free_bitmap:
> +err_free_comp_bitmap:
>  	bitmap_free(ctx->qp_ctx[HZIP_QPC_COMP].req_q.req_bitmap);
>  	return ret;
>  }
> diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
> index c3303d99acac..04c8a4c65d77 100644
> --- a/drivers/crypto/hisilicon/zip/zip_main.c
> +++ b/drivers/crypto/hisilicon/zip/zip_main.c
> @@ -586,8 +586,9 @@ static ssize_t hisi_zip_ctrl_debug_write(struct file *filp,
>  		return len;
>
>  	tbuf[len] = '\0';
> -	if (kstrtoul(tbuf, 0, &val))
> -		return -EFAULT;
> +	ret = kstrtoul(tbuf, 0, &val);
> +	if (ret)
> +		return ret;
>
>  	ret = hisi_qm_get_dfx_access(qm);
>  	if (ret)
> @@ -976,7 +977,10 @@ static int hisi_zip_pf_probe_init(struct hisi_zip *hisi_zip)
>  	qm->err_ini = &hisi_zip_err_ini;
>  	qm->err_ini->err_info_init(qm);
>
> -	hisi_zip_set_user_domain_and_cache(qm);
> +	ret = hisi_zip_set_user_domain_and_cache(qm);
> +	if (ret)
> +		return ret;
> +
>  	hisi_zip_open_sva_prefetch(qm);
>  	hisi_qm_dev_err_init(qm);
>  	hisi_zip_debug_regs_clear(qm);