* [PATCH 1/2] PCI: Remove reset argument from pci_iov_{add, remove}_virtfn()
@ 2017-09-05 23:21 Jan H. Schönherr
2017-09-05 23:21 ` [PATCH 2/2] PCI: Remove unused function __pci_reset_function() Jan H. Schönherr
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jan H. Schönherr @ 2017-09-05 23:21 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Jan H. Schönherr, linux-pci, Russell Currey, linuxppc-dev
The reset argument passed to pci_iov_add_virtfn() and
pci_iov_remove_virtfn() is always zero since commit 46cb7b1bd86fc227a
("PCI: Remove unused SR-IOV VF Migration support").
Remove the argument together with the associated code.
Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
---
arch/powerpc/kernel/eeh_driver.c | 4 ++--
drivers/pci/iov.c | 18 +++++-------------
include/linux/pci.h | 8 ++++----
3 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index c405c79..23ea86f 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -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;
/*
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 120485d..21b55ca 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -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);
pcibios_sriov_disable(dev);
err_pcibios:
@@ -355,7 +347,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);
pcibios_sriov_disable(dev);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index f958d07..4acf321 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1903,8 +1903,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);
@@ -1921,12 +1921,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)
--
2.10.0.1.g70cd14e
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] PCI: Remove unused function __pci_reset_function()
2017-09-05 23:21 [PATCH 1/2] PCI: Remove reset argument from pci_iov_{add, remove}_virtfn() Jan H. Schönherr
@ 2017-09-05 23:21 ` Jan H. Schönherr
2017-09-06 1:51 ` [PATCH 1/2] PCI: Remove reset argument from pci_iov_{add,remove}_virtfn() Russell Currey
2017-09-26 17:57 ` Bjorn Helgaas
2 siblings, 0 replies; 4+ messages in thread
From: Jan H. Schönherr @ 2017-09-05 23:21 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Jan H. Schönherr, linux-pci, Russell Currey, linuxppc-dev
The last caller of __pci_reset_function() has been removed. Remove
the function as well.
Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
---
drivers/pci/pci.c | 35 +++--------------------------------
include/linux/pci.h | 1 -
2 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index fdf65a6..dabcf5a 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4115,35 +4115,6 @@ static void pci_dev_restore(struct pci_dev *dev)
}
/**
- * __pci_reset_function - reset a PCI device function
- * @dev: PCI device to reset
- *
- * Some devices allow an individual function to be reset without affecting
- * other functions in the same device. The PCI device must be responsive
- * to PCI config space in order to use this function.
- *
- * The device function is presumed to be unused when this function is called.
- * Resetting the device will make the contents of PCI configuration space
- * random, so any caller of this must be prepared to reinitialise the
- * device including MSI, bus mastering, BARs, decoding IO and memory spaces,
- * etc.
- *
- * Returns 0 if the device function was successfully reset or negative if the
- * device doesn't support resetting a single function.
- */
-int __pci_reset_function(struct pci_dev *dev)
-{
- int ret;
-
- pci_dev_lock(dev);
- ret = __pci_reset_function_locked(dev);
- pci_dev_unlock(dev);
-
- return ret;
-}
-EXPORT_SYMBOL_GPL(__pci_reset_function);
-
-/**
* __pci_reset_function_locked - reset a PCI device function while holding
* the @dev mutex lock.
* @dev: PCI device to reset
@@ -4233,8 +4204,8 @@ int pci_probe_reset_function(struct pci_dev *dev)
*
* This function does not just reset the PCI portion of a device, but
* clears all the state associated with the device. This function differs
- * from __pci_reset_function in that it saves and restores device state
- * over the reset.
+ * from __pci_reset_function_locked() in that it saves and restores device state
+ * over the reset and takes the PCI device lock.
*
* Returns 0 if the device function was successfully reset or negative if the
* device doesn't support resetting a single function.
@@ -4269,7 +4240,7 @@ EXPORT_SYMBOL_GPL(pci_reset_function);
*
* This function does not just reset the PCI portion of a device, but
* clears all the state associated with the device. This function differs
- * from __pci_reset_function() in that it saves and restores device state
+ * from __pci_reset_function_locked() in that it saves and restores device state
* over the reset. It also differs from pci_reset_function() in that it
* requires the PCI device lock to be held.
*
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 4acf321..b55e0cf 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1066,7 +1066,6 @@ int pcie_set_mps(struct pci_dev *dev, int mps);
int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed,
enum pcie_link_width *width);
void pcie_flr(struct pci_dev *dev);
-int __pci_reset_function(struct pci_dev *dev);
int __pci_reset_function_locked(struct pci_dev *dev);
int pci_reset_function(struct pci_dev *dev);
int pci_reset_function_locked(struct pci_dev *dev);
--
2.10.0.1.g70cd14e
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] PCI: Remove reset argument from pci_iov_{add,remove}_virtfn()
2017-09-05 23:21 [PATCH 1/2] PCI: Remove reset argument from pci_iov_{add, remove}_virtfn() Jan H. Schönherr
2017-09-05 23:21 ` [PATCH 2/2] PCI: Remove unused function __pci_reset_function() Jan H. Schönherr
@ 2017-09-06 1:51 ` Russell Currey
2017-09-26 17:57 ` Bjorn Helgaas
2 siblings, 0 replies; 4+ messages in thread
From: Russell Currey @ 2017-09-06 1:51 UTC (permalink / raw)
To: Jan H. Schönherr, Bjorn Helgaas; +Cc: linux-pci, linuxppc-dev
On Wed, 2017-09-06 at 01:21 +0200, Jan H. Schönherr wrote:
> The reset argument passed to pci_iov_add_virtfn() and
> pci_iov_remove_virtfn() is always zero since commit 46cb7b1bd86fc227a
> ("PCI: Remove unused SR-IOV VF Migration support").
>
> Remove the argument together with the associated code.
>
> Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
Acked-by: Russell Currey <ruscur@russell.cc>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] PCI: Remove reset argument from pci_iov_{add,remove}_virtfn()
2017-09-05 23:21 [PATCH 1/2] PCI: Remove reset argument from pci_iov_{add, remove}_virtfn() Jan H. Schönherr
2017-09-05 23:21 ` [PATCH 2/2] PCI: Remove unused function __pci_reset_function() Jan H. Schönherr
2017-09-06 1:51 ` [PATCH 1/2] PCI: Remove reset argument from pci_iov_{add,remove}_virtfn() Russell Currey
@ 2017-09-26 17:57 ` Bjorn Helgaas
2 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2017-09-26 17:57 UTC (permalink / raw)
To: Jan H. Schönherr
Cc: Bjorn Helgaas, linux-pci, Russell Currey, linuxppc-dev
On Wed, Sep 06, 2017 at 01:21:22AM +0200, Jan H. Schönherr wrote:
> The reset argument passed to pci_iov_add_virtfn() and
> pci_iov_remove_virtfn() is always zero since commit 46cb7b1bd86fc227a
> ("PCI: Remove unused SR-IOV VF Migration support").
>
> Remove the argument together with the associated code.
>
> Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
Applied both (with Russell's ack on the first) to pci/virtualization
for v4.14, thanks!
> ---
> arch/powerpc/kernel/eeh_driver.c | 4 ++--
> drivers/pci/iov.c | 18 +++++-------------
> include/linux/pci.h | 8 ++++----
> 3 files changed, 11 insertions(+), 19 deletions(-)
>
> diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
> index c405c79..23ea86f 100644
> --- a/arch/powerpc/kernel/eeh_driver.c
> +++ b/arch/powerpc/kernel/eeh_driver.c
> @@ -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;
>
> /*
> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
> index 120485d..21b55ca 100644
> --- a/drivers/pci/iov.c
> +++ b/drivers/pci/iov.c
> @@ -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);
>
> pcibios_sriov_disable(dev);
> err_pcibios:
> @@ -355,7 +347,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);
>
> pcibios_sriov_disable(dev);
>
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index f958d07..4acf321 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1903,8 +1903,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);
> @@ -1921,12 +1921,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)
> --
> 2.10.0.1.g70cd14e
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-26 17:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-05 23:21 [PATCH 1/2] PCI: Remove reset argument from pci_iov_{add, remove}_virtfn() Jan H. Schönherr
2017-09-05 23:21 ` [PATCH 2/2] PCI: Remove unused function __pci_reset_function() Jan H. Schönherr
2017-09-06 1:51 ` [PATCH 1/2] PCI: Remove reset argument from pci_iov_{add,remove}_virtfn() Russell Currey
2017-09-26 17:57 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).