PCI: Expose reset_type to users of pci_reset_function()
Subsystems (9)
PATCH 1/4 PCI: Expose reset_type to users of pci_reset_function()
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 <[email protected]>
--- drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +- drivers/misc/genwqe/card_base.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 2 +- drivers/net/ethernet/sfc/mcdi.c | 2 +- drivers/pci/pci-sysfs.c | 2 +- drivers/pci/pci.c | 4 ++-- include/linux/pci.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)
drivers/hid/intel-ish-hid/ipc/ipc.c +1 -1
@@ -754,7 +754,7 @@ static int _ish_hw_reset(struct ishtp_device *dev)if (!pdev)return -ENODEV ; - rv =pci_reset_function (pdev); + rv =pci_reset_function (pdev,PCI_RESET_ANY );if (!rv) dev->dev_state =ISHTP_DEV_RESETTING ;
drivers/misc/genwqe/card_base.c +1 -1
@@ -201,7 +201,7 @@ static int genwqe_bus_reset(struct genwqe_dev *cd)* restored by the pci_reset_function(). */ dev_dbg (&pci_dev->dev,"[%s] pci_reset function ...\n" , __func__); - rc =pci_reset_function (pci_dev); + rc =pci_reset_function (pci_dev,PCI_RESET_ANY );if (rc) {dev_err (&pci_dev->dev,"[%s] err: failed reset func (rc %d)\n" , __func__, rc);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c +1 -1
@@ -629,7 +629,7 @@ int qlcnic_fw_create_ctx(struct qlcnic_adapter *dev)int i, err, ring;if (dev->flags &QLCNIC_NEED_FLR ) { -pci_reset_function (dev->pdev); +pci_reset_function (dev->pdev,PCI_RESET_ANY ); dev->flags &= ~QLCNIC_NEED_FLR ; }
drivers/net/ethernet/sfc/mcdi.c +1 -1
@@ -1862,7 +1862,7 @@ int efx_mcdi_reset(struct efx_nic *efx, enum reset_type method)/* If MCDI is down, we can't handle_assertion */ if (method ==RESET_TYPE_MCDI_TIMEOUT ) { - rc =pci_reset_function (efx->pci_dev); + rc =pci_reset_function (efx->pci_dev,PCI_RESET_ANY );if (rc)return rc;/* Re-enable polled MCDI completion */
drivers/pci/pci-sysfs.c +1 -1
@@ -1449,7 +1449,7 @@ static ssize_t reset_store(struct device *dev, struct device_attribute *attr,return -EINVAL ;pm_runtime_get_sync (dev); - result =pci_reset_function (pdev); + result =pci_reset_function (pdev,PCI_RESET_ANY );pm_runtime_put (dev);if (result <0 )return result;
drivers/pci/pci.c +2 -2
@@ -4792,7 +4792,7 @@ int pci_probe_reset_function(struct pci_dev *dev)* 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 pci_reset_function (struct pci_dev *dev,u32 reset_type) {int rc;
@@ -4802,7 +4802,7 @@ int pci_reset_function(struct pci_dev *dev)pci_dev_lock (dev);pci_dev_save_and_disable (dev); - rc =__pci_reset_function_locked (dev,PCI_RESET_ANY ); + rc =__pci_reset_function_locked (dev, reset_type);pci_dev_restore (dev);pci_dev_unlock (dev);
include/linux/pci.h +1 -1
@@ -1123,7 +1123,7 @@ void pcie_print_link_status(struct pci_dev *dev);bool pcie_has_flr (struct pci_dev *dev);int pcie_flr (struct pci_dev *dev);int __pci_reset_function_locked (struct pci_dev *dev,u32 reset_type); -int pci_reset_function (struct pci_dev *dev); +int pci_reset_function (struct pci_dev *dev,u32 reset_type);int pci_reset_function_locked (struct pci_dev *dev);int pci_try_reset_function (struct pci_dev *dev);int pci_probe_reset_slot (struct pci_slot *slot);
Signature · 1 line
2.18.0
PATCH 2/4 PCI: Expose reset_type to users of pci_reset_function_locked()
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 <[email protected]>
--- drivers/pci/pci.c | 4 ++-- include/linux/pci.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/pci/pci.c +2 -2
@@ -4828,7 +4828,7 @@ EXPORT_SYMBOL_GPL(pci_reset_function);* 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_locked (struct pci_dev *dev) +int pci_reset_function_locked (struct pci_dev *dev,u32 reset_type) {int rc;
@@ -4837,7 +4837,7 @@ int pci_reset_function_locked(struct pci_dev *dev)pci_dev_save_and_disable (dev); - rc =__pci_reset_function_locked (dev,PCI_RESET_ANY ); + rc =__pci_reset_function_locked (dev, reset_type);pci_dev_restore (dev);
include/linux/pci.h +1 -1
@@ -1124,7 +1124,7 @@ bool pcie_has_flr(struct pci_dev *dev);int pcie_flr (struct pci_dev *dev);int __pci_reset_function_locked (struct pci_dev *dev,u32 reset_type);int pci_reset_function (struct pci_dev *dev,u32 reset_type); -int pci_reset_function_locked (struct pci_dev *dev); +int pci_reset_function_locked (struct pci_dev *dev,u32 reset_type);int pci_try_reset_function (struct pci_dev *dev);int pci_probe_reset_slot (struct pci_slot *slot);int pci_probe_reset_bus (struct pci_bus *bus);
Signature · 1 line
2.18.0
PATCH 3/4 PCI: Expose reset type to users of pci_try_reset_function()
In reply to Sinan KayaLooking 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 <[email protected]>
--- drivers/pci/pci.c | 4 ++-- drivers/vfio/pci/vfio_pci.c | 7 ++++--- drivers/vfio/pci/vfio_pci_config.c | 4 ++-- include/linux/pci.h | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-)
drivers/pci/pci.c +2 -2
@@ -4851,7 +4851,7 @@ EXPORT_SYMBOL_GPL(pci_reset_function_locked);* * Same as above, except return -EAGAIN if unable to lock device. */ -int pci_try_reset_function (struct pci_dev *dev) +int pci_try_reset_function (struct pci_dev *dev,u32 reset_type) {int rc;
@@ -4862,7 +4862,7 @@ int pci_try_reset_function(struct pci_dev *dev)return -EAGAIN ;pci_dev_save_and_disable (dev); - rc =__pci_reset_function_locked (dev,PCI_RESET_ANY ); + rc =__pci_reset_function_locked (dev, reset_type);pci_dev_restore (dev);pci_dev_unlock (dev);
drivers/vfio/pci/vfio_pci.c +4 -3
@@ -228,7 +228,7 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev)return ret;/* If reset fails because of the device lock, fail this path entirely */ - ret =pci_try_reset_function (pdev); + ret =pci_try_reset_function (pdev,PCI_RESET_ANY );if (ret == -EAGAIN ) {pci_disable_device (pdev);return ret;
@@ -376,7 +376,7 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)* Try to reset the device. The success of this is dependent on * being able to lock the device, which is not always possible. */ -if (vdev->reset_works && !pci_try_reset_function (pdev)) +if (vdev->reset_works && !pci_try_reset_function (pdev,PCI_RESET_ANY )) vdev->needs_reset = false;pci_restore_state (pdev);
@@ -844,7 +844,8 @@ static long vfio_pci_ioctl(void *device_data, }else if (cmd ==VFIO_DEVICE_RESET ) {return vdev->reset_works ? -pci_try_reset_function (vdev->pdev) : -EINVAL ; +pci_try_reset_function (vdev->pdev,PCI_RESET_ANY ) : + -EINVAL ; }else if (cmd ==VFIO_DEVICE_GET_PCI_HOT_RESET_INFO ) {struct vfio_pci_hot_reset_info hdr;
drivers/vfio/pci/vfio_pci_config.c +2 -2
@@ -831,7 +831,7 @@ static int vfio_exp_config_write(struct vfio_pci_device *vdev, int pos, &cap);if (!ret && (cap &PCI_EXP_DEVCAP_FLR )) -pci_try_reset_function (vdev->pdev); +pci_try_reset_function (vdev->pdev,PCI_RESET_ANY ); }/*
@@ -910,7 +910,7 @@ static int vfio_af_config_write(struct vfio_pci_device *vdev, int pos, &cap);if (!ret && (cap &PCI_AF_CAP_FLR ) && (cap &PCI_AF_CAP_TP )) -pci_try_reset_function (vdev->pdev); +pci_try_reset_function (vdev->pdev,PCI_RESET_ANY ); }return count;
include/linux/pci.h +1 -1
@@ -1125,7 +1125,7 @@ int pcie_flr(struct pci_dev *dev);int __pci_reset_function_locked (struct pci_dev *dev,u32 reset_type);int pci_reset_function (struct pci_dev *dev,u32 reset_type);int pci_reset_function_locked (struct pci_dev *dev,u32 reset_type); -int pci_try_reset_function (struct pci_dev *dev); +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);
Signature · 1 line
2.18.0
PATCH 4/4 PCI: Expose reset type to users of pci_probe_reset_function()
In reply to Sinan KayaLooking 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 <[email protected]>
--- drivers/pci/pci.c | 51 ++++++++++++++++++++++++++++++--------------- drivers/pci/pci.h | 2 +- drivers/pci/probe.c | 2 +- 3 files changed, 36 insertions(+), 19 deletions(-)
drivers/pci/pci.c +34 -17
@@ -4752,28 +4752,45 @@ EXPORT_SYMBOL_GPL(__pci_reset_function_locked);* Returns 0 if the device function can be reset or negative if the * device doesn't support resetting a single function. */ -int pci_probe_reset_function (struct pci_dev *dev) +int pci_probe_reset_function (struct pci_dev *dev,u32 reset_type) { -int rc; +int rc =0 ;might_sleep (); - rc =pci_dev_specific_reset (dev,1 ); -if (rc != -ENOTTY ) -return rc; -if (pcie_has_flr (dev)) -return 0 ; - rc =pci_af_flr (dev,1 ); -if (rc != -ENOTTY ) -return rc; - rc =pci_pm_reset (dev,1 ); -if (rc != -ENOTTY ) -return rc; - rc =pci_dev_reset_slot_function (dev,1 ); -if (rc != -ENOTTY ) -return rc; +if (reset_type &PCI_RESET_DEV_SPECIFIC ) { + rc =pci_dev_specific_reset (dev,1 ); +if (rc != -ENOTTY ) +return rc; + } + +if (reset_type &PCI_RESET_FLR ) { +if (pcie_has_flr (dev)) +return 0 ; + rc =pci_af_flr (dev,1 ); +if (rc != -ENOTTY ) +return rc; + } -return pci_parent_bus_reset (dev,1 ); +if (reset_type &PCI_RESET_PM ) { + rc =pci_pm_reset (dev,1 ); +if (rc != -ENOTTY ) +return rc; + } + +if (reset_type &PCI_RESET_SLOT ) { + rc =pci_dev_reset_slot_function (dev,1 ); +if (rc != -ENOTTY ) +return rc; + } + +if (reset_type &PCI_RESET_BUS ) { + rc =pci_parent_bus_reset (dev,1 ); +if (rc != -ENOTTY ) +return rc; + } + +return rc; }/**
drivers/pci/pci.h +1 -1
@@ -33,7 +33,7 @@ enum pci_mmap_api {int pci_mmap_fits (struct pci_dev *pdev,int resno,struct vm_area_struct *vmai,enum pci_mmap_api mmap_api); -int pci_probe_reset_function (struct pci_dev *dev); +int pci_probe_reset_function (struct pci_dev *dev,u32 reset_type);int pci_bridge_secondary_bus_reset (struct pci_dev *dev);/**
drivers/pci/probe.c +1 -1
@@ -2332,7 +2332,7 @@ static void pci_init_capabilities(struct pci_dev *dev)pcie_report_downtraining (dev); -if (pci_probe_reset_function (dev) ==0 ) +if (pci_probe_reset_function (dev,PCI_RESET_ANY ) ==0 ) dev->reset_fn =1 ; }
Signature · 1 line
2.18.0