[PATCH v3 14/19] crypto: qat: convert tasklets to use new tasklet_setup() API

[Giovanni Cabiddu]

Hi Allen,

On Tue, Jan 12, 2021 at 07:16:45AM +0530, Allen Pais wrote:
> From: Allen Pais <apais at linux.microsoft.com>
> 
> In preparation for unconditionally passing the
> struct tasklet_struct pointer to all tasklet
> callbacks, switch to using the new tasklet_setup()
> and from_tasklet() to pass the tasklet pointer explicitly.

I have two minor comments:
  * Patches to the qat driver have the following headline
        crypto: qat -
  * Checkpatch reports two alignment checks when it is run with --strict:
        CHECK: Alignment should match open parenthesis
        #33: FILE: drivers/crypto/qat/qat_common/adf_isr.c:248:
        +               tasklet_setup(&priv_data->banks[i].resp_handler,
        +                            adf_response_handler);

        CHECK: Alignment should match open parenthesis
        #62: FILE: drivers/crypto/qat/qat_common/adf_sriov.c:57:
        +               tasklet_setup(&vf_info->vf2pf_bh_tasklet,
        +                            adf_vf2pf_bh_handler);

        total: 0 errors, 0 warnings, 2 checks, 83 lines checked

If you prefer I can resubmit this patch with these two changes.

Regards,

-- 
Giovanni

> 
> Signed-off-by: Romain Perier <romain.perier at gmail.com>
> Signed-off-by: Allen Pais <apais at linux.microsoft.com>
> ---
>  drivers/crypto/qat/qat_common/adf_isr.c               |  5 ++---
>  drivers/crypto/qat/qat_common/adf_sriov.c             | 10 +++++-----
>  drivers/crypto/qat/qat_common/adf_transport.c         |  4 ++--
>  .../crypto/qat/qat_common/adf_transport_internal.h    |  2 +-
>  drivers/crypto/qat/qat_common/adf_vf_isr.c            | 11 +++++------
>  5 files changed, 15 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/crypto/qat/qat_common/adf_isr.c b/drivers/crypto/qat/qat_common/adf_isr.c
> index c45853463530..bb5251d587eb 100644
> --- a/drivers/crypto/qat/qat_common/adf_isr.c
> +++ b/drivers/crypto/qat/qat_common/adf_isr.c
> @@ -244,9 +244,8 @@ static int adf_setup_bh(struct adf_accel_dev *accel_dev)
>  	int i;
>  
>  	for (i = 0; i < hw_data->num_banks; i++)
> -		tasklet_init(&priv_data->banks[i].resp_handler,
> -			     adf_response_handler,
> -			     (unsigned long)&priv_data->banks[i]);
> +		tasklet_setup(&priv_data->banks[i].resp_handler,
> +			     adf_response_handler);
>  	return 0;
>  }
>  
> diff --git a/drivers/crypto/qat/qat_common/adf_sriov.c b/drivers/crypto/qat/qat_common/adf_sriov.c
> index 8c822c2861c2..591537399edb 100644
> --- a/drivers/crypto/qat/qat_common/adf_sriov.c
> +++ b/drivers/crypto/qat/qat_common/adf_sriov.c
> @@ -24,9 +24,10 @@ static void adf_iov_send_resp(struct work_struct *work)
>  	kfree(pf2vf_resp);
>  }
>  
> -static void adf_vf2pf_bh_handler(void *data)
> +static void adf_vf2pf_bh_handler(struct tasklet_struct *t)
>  {
> -	struct adf_accel_vf_info *vf_info = (struct adf_accel_vf_info *)data;
> +	struct adf_accel_vf_info *vf_info =
> +				from_tasklet(vf_info, t, vf2pf_bh_tasklet);
>  	struct adf_pf2vf_resp *pf2vf_resp;
>  
>  	pf2vf_resp = kzalloc(sizeof(*pf2vf_resp), GFP_ATOMIC);
> @@ -52,9 +53,8 @@ static int adf_enable_sriov(struct adf_accel_dev *accel_dev)
>  		vf_info->accel_dev = accel_dev;
>  		vf_info->vf_nr = i;
>  
> -		tasklet_init(&vf_info->vf2pf_bh_tasklet,
> -			     (void *)adf_vf2pf_bh_handler,
> -			     (unsigned long)vf_info);
> +		tasklet_setup(&vf_info->vf2pf_bh_tasklet,
> +			     adf_vf2pf_bh_handler);
>  		mutex_init(&vf_info->pf2vf_lock);
>  		ratelimit_state_init(&vf_info->vf2pf_ratelimit,
>  				     DEFAULT_RATELIMIT_INTERVAL,
> diff --git a/drivers/crypto/qat/qat_common/adf_transport.c b/drivers/crypto/qat/qat_common/adf_transport.c
> index 5a7030acdc33..03dcbeac25d7 100644
> --- a/drivers/crypto/qat/qat_common/adf_transport.c
> +++ b/drivers/crypto/qat/qat_common/adf_transport.c
> @@ -324,9 +324,9 @@ static void adf_ring_response_handler(struct adf_etr_bank_data *bank)
>  		adf_handle_response(&bank->rings[i]);
>  }
>  
> -void adf_response_handler(uintptr_t bank_addr)
> +void adf_response_handler(struct tasklet_struct *t)
>  {
> -	struct adf_etr_bank_data *bank = (void *)bank_addr;
> +	struct adf_etr_bank_data *bank = from_tasklet(bank, t, resp_handler);
>  	struct adf_hw_csr_ops *csr_ops = GET_CSR_OPS(bank->accel_dev);
>  
>  	/* Handle all the responses and reenable IRQs */
> diff --git a/drivers/crypto/qat/qat_common/adf_transport_internal.h b/drivers/crypto/qat/qat_common/adf_transport_internal.h
> index 501bcf0f1809..aaec7b2bc220 100644
> --- a/drivers/crypto/qat/qat_common/adf_transport_internal.h
> +++ b/drivers/crypto/qat/qat_common/adf_transport_internal.h
> @@ -46,7 +46,7 @@ struct adf_etr_data {
>  	struct dentry *debug;
>  };
>  
> -void adf_response_handler(uintptr_t bank_addr);
> +void adf_response_handler(struct tasklet_struct *t);
>  #ifdef CONFIG_DEBUG_FS
>  #include <linux/debugfs.h>
>  int adf_bank_debugfs_add(struct adf_etr_bank_data *bank);
> diff --git a/drivers/crypto/qat/qat_common/adf_vf_isr.c b/drivers/crypto/qat/qat_common/adf_vf_isr.c
> index 38d316a42ba6..1d0ff58fd9b5 100644
> --- a/drivers/crypto/qat/qat_common/adf_vf_isr.c
> +++ b/drivers/crypto/qat/qat_common/adf_vf_isr.c
> @@ -68,9 +68,10 @@ static void adf_dev_stop_async(struct work_struct *work)
>  	kfree(stop_data);
>  }
>  
> -static void adf_pf2vf_bh_handler(void *data)
> +static void adf_pf2vf_bh_handler(struct tasklet_struct *t)
>  {
> -	struct adf_accel_dev *accel_dev = data;
> +	struct adf_accel_dev *accel_dev = from_tasklet(accel_dev, t,
> +						       vf.pf2vf_bh_tasklet);
>  	struct adf_hw_device_data *hw_data = accel_dev->hw_device;
>  	struct adf_bar *pmisc =
>  			&GET_BARS(accel_dev)[hw_data->get_misc_bar_id(hw_data)];
> @@ -138,8 +139,7 @@ static void adf_pf2vf_bh_handler(void *data)
>  
>  static int adf_setup_pf2vf_bh(struct adf_accel_dev *accel_dev)
>  {
> -	tasklet_init(&accel_dev->vf.pf2vf_bh_tasklet,
> -		     (void *)adf_pf2vf_bh_handler, (unsigned long)accel_dev);
> +	tasklet_setup(&accel_dev->vf.pf2vf_bh_tasklet, adf_pf2vf_bh_handler);
>  
>  	mutex_init(&accel_dev->vf.vf2pf_lock);
>  	return 0;
> @@ -216,8 +216,7 @@ static int adf_setup_bh(struct adf_accel_dev *accel_dev)
>  {
>  	struct adf_etr_data *priv_data = accel_dev->transport;
>  
> -	tasklet_init(&priv_data->banks[0].resp_handler, adf_response_handler,
> -		     (unsigned long)priv_data->banks);
> +	tasklet_setup(&priv_data->banks[0].resp_handler, adf_response_handler);
>  	return 0;
>  }
>  
> -- 
> 2.25.1
>