Subject: Re: [PATCH 6/7] vDPA/ifcvf: implement config interrupt request helper

From: "Michael S. Tsirkin" <[email-masked]>
Date: Mon, 10 Jan 2022 01:07:01 -0500

On Mon, Jan 10, 2022 at 01:18:50PM +0800, Zhu Lingshan wrote:
> This commit implements new helper to request config interrupt by
> a given MSIX vector.
> 
> Signed-off-by: Zhu Lingshan <[email-masked]>
> ---
>  drivers/vdpa/ifcvf/ifcvf_base.c |  6 ------
>  drivers/vdpa/ifcvf/ifcvf_main.c | 26 ++++++++++++++++++++++++++
>  2 files changed, 26 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/vdpa/ifcvf/ifcvf_base.c b/drivers/vdpa/ifcvf/ifcvf_base.c
> index fc496d10cf8d..38f91dc6481f 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_base.c
> +++ b/drivers/vdpa/ifcvf/ifcvf_base.c
> @@ -330,12 +330,6 @@ static int ifcvf_hw_enable(struct ifcvf_hw *hw)
>  
>  	ifcvf = vf_to_adapter(hw);
>  	cfg = hw->common_cfg;
> -	ifc_iowrite16(IFCVF_MSI_CONFIG_OFF, &cfg->msix_config);
> -
> -	if (ifc_ioread16(&cfg->msix_config) == VIRTIO_MSI_NO_VECTOR) {
> -		IFCVF_ERR(ifcvf->pdev, "No msix vector for device config\n");
> -		return -EINVAL;
> -	}
>  
>  	for (i = 0; i < hw->nr_vring; i++) {
>  		if (!hw->vring[i].ready)

this drops code presumably breaking it. I guess follow up patch
restores it back? pls squash there.

> diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
> index ce2fbc429fbe..414b5dfd04ca 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_main.c
> +++ b/drivers/vdpa/ifcvf/ifcvf_main.c
> @@ -162,6 +162,32 @@ static int ifcvf_request_vq_irq(struct ifcvf_adapter *adapter, u8 vector_per_vq)
>  	return ret;
>  }
>  
> +static int ifcvf_request_config_irq(struct ifcvf_adapter *adapter, int config_vector)
> +{
> +	struct pci_dev *pdev = adapter->pdev;
> +	struct ifcvf_hw *vf = &adapter->vf;
> +	int ret;
> +
> +	if (!config_vector) {
> +		IFCVF_INFO(pdev, "No config interrupt because of no vectors\n");
> +		vf->config_irq = -EINVAL;
> +		return 0;
> +	}
> +
> +	snprintf(vf->config_msix_name, 256, "ifcvf[%s]-config\n",
> +		 pci_name(pdev));
> +	vf->config_irq = pci_irq_vector(pdev, config_vector);
> +	ret = devm_request_irq(&pdev->dev, vf->config_irq,
> +			       ifcvf_config_changed, 0,
> +			       vf->config_msix_name, vf);
> +	if (ret) {
> +		IFCVF_ERR(pdev, "Failed to request config irq\n");
> +		return ret;
> +	}
> +		ifcvf_set_config_vector(vf, config_vector);
> +
> +	return 0;
> +}
>  

So this adds a static function with no caller, I guess the
caller is in the next patch - pls squash there.

>  static int ifcvf_request_irq(struct ifcvf_adapter *adapter)
>  {
> -- 
> 2.27.0