On Wed, Jul 24, 2013 at 3:26 AM, Yijing Wang <wangyijing@xxxxxxxxxx> wrote: > Currently, we only update NumVFs register during sriov_enable(). > This register should also be updated properly during sriov_disable. > Otherwise, we will get the stale "Number of VFs" info from lspci. > > Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx> Applied to pci/misc, thanks! > --- > drivers/pci/iov.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c > index de8ffac..6e4844b 100644 > --- a/drivers/pci/iov.c > +++ b/drivers/pci/iov.c > @@ -286,7 +286,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) > (!(iov->cap & PCI_SRIOV_CAP_VFM) && (nr_virtfn > initial))) > return -EINVAL; > > - pci_write_config_word(dev, iov->pos + PCI_SRIOV_NUM_VF, nr_virtfn); > pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_OFFSET, &offset); > pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_STRIDE, &stride); > if (!offset || (nr_virtfn > 1 && !stride)) > @@ -334,6 +333,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) > return rc; > } > > + pci_write_config_word(dev, iov->pos + PCI_SRIOV_NUM_VF, nr_virtfn); > iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE; > pci_cfg_access_lock(dev); > pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); > @@ -368,6 +368,7 @@ failed: > iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE); > 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_NUM_VF, 0); > ssleep(1); > pci_cfg_access_unlock(dev); > > @@ -401,6 +402,7 @@ static void sriov_disable(struct pci_dev *dev) > sysfs_remove_link(&dev->dev.kobj, "dep_link"); > > iov->num_VFs = 0; > + pci_write_config_word(dev, iov->pos + PCI_SRIOV_NUM_VF, 0); > } > > static int sriov_init(struct pci_dev *dev, int pos) > -- > 1.7.1 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
