On Fri, 2018-09-14 at 21:18 +0000, Sinan Kaya wrote:
> 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@xxxxxxxxxx>
> ---
> drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +-
For intel-ish-hid, change looks fine.
Thanks,
Srinivas
> 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(-)
>
> diff --git a/drivers/hid/intel-ish-hid/ipc/ipc.c b/drivers/hid/intel-
> ish-hid/ipc/ipc.c
> index bfbca7ec54ce..18312969f1b3 100644
> --- a/drivers/hid/intel-ish-hid/ipc/ipc.c
> +++ b/drivers/hid/intel-ish-hid/ipc/ipc.c
> @@ -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;
>
> diff --git a/drivers/misc/genwqe/card_base.c
> b/drivers/misc/genwqe/card_base.c
> index c7cd3675bcd1..cc78ef28ee38 100644
> --- a/drivers/misc/genwqe/card_base.c
> +++ b/drivers/misc/genwqe/card_base.c
> @@ -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);
> diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
> b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
> index d344e9d43832..bb737725f175 100644
> --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
> +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
> @@ -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;
> }
>
> diff --git a/drivers/net/ethernet/sfc/mcdi.c
> b/drivers/net/ethernet/sfc/mcdi.c
> index dfad93fca0a6..7f95e17b8a48 100644
> --- a/drivers/net/ethernet/sfc/mcdi.c
> +++ b/drivers/net/ethernet/sfc/mcdi.c
> @@ -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 */
> diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
> index 9ecfe13157c0..9569664ec4b2 100644
> --- a/drivers/pci/pci-sysfs.c
> +++ b/drivers/pci/pci-sysfs.c
> @@ -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;
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 8912c8ba3b2b..2b1e2b4893f3 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -4793,7 +4793,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;
>
> @@ -4803,7 +4803,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);
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index d2e0a8c8177b..1a1a76130e91 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -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);
