Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3443c382 authored by Alexander Duyck's avatar Alexander Duyck Committed by Bjorn Helgaas
Browse files

PCI: Remove VFs in reverse order if virtfn_add() fails 



If virtfn_add() fails, we call virtfn_remove() for any previously added
devices.  Remove the devices in reverse order (first-added is
last-removed), which is more natural and doesn't require an additional
variable.

[bhelgaas: changelog, split to separate patch for reviewability]
Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarWei Yang <weiyang@linux.vnet.ibm.com>
parent ce288ec3

drivers/pci/iov.c

+3 −3
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ int __weak pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs) 
static int sriov_enable(struct pci_dev *dev, int nr_virtfn)

{

	int rc;

	int i, j;

	int i;

	int nres;

	u16 initial;

	struct resource *res;
@@ -328,8 +328,8 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) 
	return 0;



failed:

	for (j = 0; j < i; j++)

		virtfn_remove(dev, j, 0);

	while (i--)

		virtfn_remove(dev, i, 0);



	iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE);

	pci_cfg_access_lock(dev);