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

Commit 753f6124 authored by Jan H. Schönherr's avatar Jan H. Schönherr Committed by Bjorn Helgaas
Browse files

PCI: Remove reset argument from pci_iov_{add,remove}_virtfn() 



The "reset" argument passed to pci_iov_add_virtfn() and
pci_iov_remove_virtfn() is always zero since 46cb7b1b ("PCI: Remove
unused SR-IOV VF Migration support")

Remove the argument together with the associated code.

Signed-off-by: default avatarJan H. Schönherr <jschoenh@amazon.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRussell Currey <ruscur@russell.cc>
parent 9e66317d

arch/powerpc/kernel/eeh_driver.c

+2 −2
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ static void *eeh_add_virt_device(void *data, void *userdata) 
	}



#ifdef CONFIG_PPC_POWERNV

	pci_iov_add_virtfn(edev->physfn, pdn->vf_index, 0);

	pci_iov_add_virtfn(edev->physfn, pdn->vf_index);

#endif

	return NULL;

}
@@ -499,7 +499,7 @@ static void *eeh_rmv_device(void *data, void *userdata) 
#ifdef CONFIG_PPC_POWERNV

		struct pci_dn *pdn = eeh_dev_to_pdn(edev);



		pci_iov_remove_virtfn(edev->physfn, pdn->vf_index, 0);

		pci_iov_remove_virtfn(edev->physfn, pdn->vf_index);

		edev->pdev = NULL;



		/*

drivers/pci/iov.c

+5 −13
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) 
	return dev->sriov->barsz[resno - PCI_IOV_RESOURCES];

}



int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset)

int pci_iov_add_virtfn(struct pci_dev *dev, int id)

{

	int i;

	int rc = -ENOMEM;
@@ -157,9 +157,6 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset) 
		BUG_ON(rc);

	}



	if (reset)

		__pci_reset_function(virtfn);



	pci_device_add(virtfn, virtfn->bus);



	pci_bus_add_device(virtfn);
@@ -187,7 +184,7 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset) 
	return rc;

}



void pci_iov_remove_virtfn(struct pci_dev *dev, int id, int reset)

void pci_iov_remove_virtfn(struct pci_dev *dev, int id)

{

	char buf[VIRTFN_ID_LEN];

	struct pci_dev *virtfn;
@@ -198,11 +195,6 @@ void pci_iov_remove_virtfn(struct pci_dev *dev, int id, int reset) 
	if (!virtfn)

		return;



	if (reset) {

		device_release_driver(&virtfn->dev);

		__pci_reset_function(virtfn);

	}



	sprintf(buf, "virtfn%u", id);

	sysfs_remove_link(&dev->dev.kobj, buf);

	/*
@@ -317,7 +309,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) 
	pci_cfg_access_unlock(dev);



	for (i = 0; i < initial; i++) {

		rc = pci_iov_add_virtfn(dev, i, 0);

		rc = pci_iov_add_virtfn(dev, i);

		if (rc)

			goto failed;

	}
@@ -329,7 +321,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) 


failed:

	while (i--)

		pci_iov_remove_virtfn(dev, i, 0);

		pci_iov_remove_virtfn(dev, i);



err_pcibios:

	iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE);
@@ -356,7 +348,7 @@ static void sriov_disable(struct pci_dev *dev) 
		return;



	for (i = 0; i < iov->num_VFs; i++)

		pci_iov_remove_virtfn(dev, i, 0);

		pci_iov_remove_virtfn(dev, i);



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

	pci_cfg_access_lock(dev);

include/linux/pci.h

+4 −4
Original line number Diff line number Diff line
@@ -1958,8 +1958,8 @@ int pci_iov_virtfn_devfn(struct pci_dev *dev, int id); 


int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);

void pci_disable_sriov(struct pci_dev *dev);

int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset);

void pci_iov_remove_virtfn(struct pci_dev *dev, int id, int reset);

int pci_iov_add_virtfn(struct pci_dev *dev, int id);

void pci_iov_remove_virtfn(struct pci_dev *dev, int id);

int pci_num_vf(struct pci_dev *dev);

int pci_vfs_assigned(struct pci_dev *dev);

int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
@@ -1976,12 +1976,12 @@ static inline int pci_iov_virtfn_devfn(struct pci_dev *dev, int id) 
}

static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)

{ return -ENODEV; }

static inline int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset)

static inline int pci_iov_add_virtfn(struct pci_dev *dev, int id)

{

	return -ENOSYS;

}

static inline void pci_iov_remove_virtfn(struct pci_dev *dev,

					 int id, int reset) { }

					 int id) { }

static inline void pci_disable_sriov(struct pci_dev *dev) { }

static inline int pci_num_vf(struct pci_dev *dev) { return 0; }

static inline int pci_vfs_assigned(struct pci_dev *dev)