korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

vDPA/ifcvf: decouple vq IRQ releasers from the adapter

Browse Source 
This commit decouples the IRQ releasers from the
adapter, so that these functions could be
safely invoked once probe

Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
Cc: stable@vger.kernel.org
Message-Id: <20221125145724.1129962-5-lingshan.zhu@intel.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Zhu Lingshan 2022-11-25 22:57:16 +08:00 committed by Michael S. Tsirkin
parent 66e3970b16
commit 004cbcabab
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/vdpa/ifcvf/ifcvf_main.c
View File

@ -69,10 +69,9 @@ static void ifcvf_free_irq_vectors(void *data)
pci_free_irq_vectors(data); pci_free_irq_vectors(data);
} }
static void ifcvf_free_per_vq_irq(struct ifcvf_adapter *adapter) static void ifcvf_free_per_vq_irq(struct ifcvf_hw *vf)
{ {
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = vf->pdev;
struct ifcvf_hw *vf = &adapter->vf;
int i; int i;
for (i = 0; i < vf->nr_vring; i++) { for (i = 0; i < vf->nr_vring; i++) {
@ -83,10 +82,9 @@ static void ifcvf_free_per_vq_irq(struct ifcvf_adapter *adapter)
} }
} }
static void ifcvf_free_vqs_reused_irq(struct ifcvf_adapter *adapter) static void ifcvf_free_vqs_reused_irq(struct ifcvf_hw *vf)
{ {
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = vf->pdev;
struct ifcvf_hw *vf = &adapter->vf;
if (vf->vqs_reused_irq != -EINVAL) { if (vf->vqs_reused_irq != -EINVAL) {
devm_free_irq(&pdev->dev, vf->vqs_reused_irq, vf); devm_free_irq(&pdev->dev, vf->vqs_reused_irq, vf);
@ -95,14 +93,12 @@ static void ifcvf_free_vqs_reused_irq(struct ifcvf_adapter *adapter)
} }
static void ifcvf_free_vq_irq(struct ifcvf_adapter *adapter) static void ifcvf_free_vq_irq(struct ifcvf_hw *vf)
{ {
struct ifcvf_hw *vf = &adapter->vf;
if (vf->msix_vector_status == MSIX_VECTOR_PER_VQ_AND_CONFIG) if (vf->msix_vector_status == MSIX_VECTOR_PER_VQ_AND_CONFIG)
ifcvf_free_per_vq_irq(adapter); ifcvf_free_per_vq_irq(vf);
else else
ifcvf_free_vqs_reused_irq(adapter); ifcvf_free_vqs_reused_irq(vf);
} }
static void ifcvf_free_config_irq(struct ifcvf_adapter *adapter) static void ifcvf_free_config_irq(struct ifcvf_adapter *adapter)
@ -126,8 +122,9 @@ static void ifcvf_free_config_irq(struct ifcvf_adapter *adapter)
static void ifcvf_free_irq(struct ifcvf_adapter *adapter) static void ifcvf_free_irq(struct ifcvf_adapter *adapter)
{ {
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
struct ifcvf_hw *vf = &adapter->vf;
ifcvf_free_vq_irq(adapter); ifcvf_free_vq_irq(vf);
ifcvf_free_config_irq(adapter); ifcvf_free_config_irq(adapter);
ifcvf_free_irq_vectors(pdev); ifcvf_free_irq_vectors(pdev);
} }