| Message ID | 20180914211808.2564-7-okaya@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: Add reset type parameter to PCI reset functions | expand |
On Fri, 14 Sep 2018 21:18:08 +0000 Sinan Kaya <okaya@kernel.org> wrote: > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > index fe7ada997c51..754f08286bb1 100644 > --- a/drivers/vfio/pci/vfio_pci.c > +++ b/drivers/vfio/pci/vfio_pci.c > @@ -1015,7 +1015,7 @@ static long vfio_pci_ioctl(void *device_data, > &info, slot); > if (!ret) > /* User has access, do the reset */ > - ret = pci_reset_bus(vdev->pdev); > + ret = pci_reset_bus(vdev->pdev, PCI_RESET_LINK); This should have switched back the control we had prior to 811c5cb37df4 with something like: ret = pci_reset_bus(vdev->pdev, slot ? PCI_RESET_SLOT : PCI_RESET_BUS); > > hot_reset_release: > for (i--; i >= 0; i--) > @@ -1390,7 +1390,7 @@ static void vfio_pci_try_bus_reset(struct vfio_pci_device *vdev) > } > > if (needs_reset) > - ret = pci_reset_bus(vdev->pdev); > + ret = pci_reset_bus(vdev->pdev, PCI_RESET_LINK); Same here. Thanks, Alex
On 9/14/2018 6:33 PM, Alex Williamson wrote: >> @@ -1015,7 +1015,7 @@ static long vfio_pci_ioctl(void *device_data, >> &info, slot); >> if (!ret) >> /* User has access, do the reset */ >> - ret = pci_reset_bus(vdev->pdev); >> + ret = pci_reset_bus(vdev->pdev, PCI_RESET_LINK); > This should have switched back the control we had prior to 811c5cb37df4 > with something like: > > ret = pci_reset_bus(vdev->pdev, > slot ? PCI_RESET_SLOT : PCI_RESET_BUS); > >> >> hot_reset_release: >> for (i--; i >= 0; i--) >> @@ -1390,7 +1390,7 @@ static void vfio_pci_try_bus_reset(struct vfio_pci_device *vdev) >> } >> >> if (needs_reset) >> - ret = pci_reset_bus(vdev->pdev); >> + ret = pci_reset_bus(vdev->pdev, PCI_RESET_LINK); > Same here. Sure I can do that.
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 32b367937cc1..7192cd460db4 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5232,13 +5232,25 @@ static int __pci_reset_bus(struct pci_bus *bus) /** * pci_reset_bus - Try to reset a PCI bus * @pdev: top level PCI device to reset via slot/bus + * @reset_type: resets to try * * Same as above except return -EAGAIN if the bus cannot be locked */ -int pci_reset_bus(struct pci_dev *pdev) +int pci_reset_bus(struct pci_dev *pdev, u32 reset_type) { - return (!pci_probe_reset_slot(pdev->slot)) ? - __pci_reset_slot(pdev->slot) : __pci_reset_bus(pdev->bus); + if (reset_type & PCI_RESET_LINK) { + return (!pci_probe_reset_slot(pdev->slot)) ? + __pci_reset_slot(pdev->slot) : + __pci_reset_bus(pdev->bus); + } + + if (reset_type & PCI_RESET_BUS) + return __pci_reset_bus(pdev->bus); + + if (reset_type & PCI_RESET_SLOT) + return __pci_reset_slot(pdev->slot); + + return -EINVAL; } EXPORT_SYMBOL_GPL(pci_reset_bus); diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index fe7ada997c51..754f08286bb1 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -1015,7 +1015,7 @@ static long vfio_pci_ioctl(void *device_data, &info, slot); if (!ret) /* User has access, do the reset */ - ret = pci_reset_bus(vdev->pdev); + ret = pci_reset_bus(vdev->pdev, PCI_RESET_LINK); hot_reset_release: for (i--; i >= 0; i--) @@ -1390,7 +1390,7 @@ static void vfio_pci_try_bus_reset(struct vfio_pci_device *vdev) } if (needs_reset) - ret = pci_reset_bus(vdev->pdev); + ret = pci_reset_bus(vdev->pdev, PCI_RESET_LINK); put_devs: for (i = 0; i < devs.cur_index; i++) { diff --git a/include/linux/pci.h b/include/linux/pci.h index 4fdddcb85066..85f48e156753 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1128,7 +1128,7 @@ int pci_reset_function_locked(struct pci_dev *dev, u32 reset_type); int pci_try_reset_function(struct pci_dev *dev, u32 reset_type); int pci_probe_reset_slot(struct pci_slot *slot); int pci_probe_reset_bus(struct pci_bus *bus); -int pci_reset_bus(struct pci_dev *dev); +int pci_reset_bus(struct pci_dev *dev, u32 reset_type); void pci_reset_secondary_bus(struct pci_dev *dev); void pcibios_reset_secondary_bus(struct pci_dev *dev); void pci_update_resource(struct pci_dev *dev, int resno);
Looking to have more control between the users of the API vs. what the API can do internally. The new reset_type tells the PCI core about the bounds of the request. Signed-off-by: Sinan Kaya <okaya@kernel.org> --- drivers/pci/pci.c | 18 +++++++++++++++--- drivers/vfio/pci/vfio_pci.c | 4 ++-- include/linux/pci.h | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-)