UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PCI/IOV: Factor out sriov_add_vfs() 

Provide sriov_add_vfs() as a wrapper to scan for VFs that cleans up after
itself.  This is just a code simplification.  No functional change.

Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Sebastian Ott 2018-12-21 15:14:18 +01:00 committed by Bjorn Helgaas
parent 651022382c
commit 18f9e9d150
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/pci/iov.c
View File

@ -252,6 +252,24 @@ int __weak pcibios_sriov_disable(struct pci_dev *pdev)
return 0; return 0;
} }
static int sriov_add_vfs(struct pci_dev *dev, u16 num_vfs)
{
unsigned int i;
int rc;
for (i = 0; i < num_vfs; i++) {
rc = pci_iov_add_virtfn(dev, i);
if (rc)
goto failed;
}
return 0;
failed:
while (i--)
pci_iov_remove_virtfn(dev, i);
return rc;
}
static int sriov_enable(struct pci_dev *dev, int nr_virtfn) static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
{ {
int rc; int rc;
@ -337,21 +355,15 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
msleep(100); msleep(100);
pci_cfg_access_unlock(dev); pci_cfg_access_unlock(dev);
for (i = 0; i < initial; i++) { rc = sriov_add_vfs(dev, initial);
rc = pci_iov_add_virtfn(dev, i); if (rc)
if (rc) goto err_pcibios;
goto failed;
}
kobject_uevent(&dev->dev.kobj, KOBJ_CHANGE); kobject_uevent(&dev->dev.kobj, KOBJ_CHANGE);
iov->num_VFs = nr_virtfn; iov->num_VFs = nr_virtfn;
return 0; return 0;
failed:
while (i--)
pci_iov_remove_virtfn(dev, i);
err_pcibios: err_pcibios:
iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE); iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE);
pci_cfg_access_lock(dev); pci_cfg_access_lock(dev);
@ -368,17 +380,23 @@ err_pcibios:
return rc; return rc;
} }
static void sriov_del_vfs(struct pci_dev *dev)
{
struct pci_sriov *iov = dev->sriov;
int i;
for (i = 0; i < iov->num_VFs; i++)
pci_iov_remove_virtfn(dev, i);
}
static void sriov_disable(struct pci_dev *dev) static void sriov_disable(struct pci_dev *dev)
{ {
int i;
struct pci_sriov *iov = dev->sriov; struct pci_sriov *iov = dev->sriov;
if (!iov->num_VFs) if (!iov->num_VFs)
return; return;
for (i = 0; i < iov->num_VFs; i++) sriov_del_vfs(dev);
pci_iov_remove_virtfn(dev, i);
iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE); iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE);
pci_cfg_access_lock(dev); pci_cfg_access_lock(dev);
pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl);