@@ -897,7 +897,8 @@ static int trigger_sbr(struct hfi1_devdata *dd)
* to be implemented to have cleaner interface but this fixes the
* current brokenness
*/
- return __pci_reset_function_locked(dev, PCI_RESET_LINK);
+ return pci_reset_function_locked(dev, PCI_RESET_LINK |
+ PCI_RESET_NOSAVERESTORE);
}
/*
@@ -989,7 +989,8 @@ static void octeon_pci_flr(struct octeon_device *oct)
pci_write_config_word(oct->pci_dev, PCI_COMMAND,
PCI_COMMAND_INTX_DISABLE);
- rc = __pci_reset_function_locked(oct->pci_dev, PCI_RESET_ANY);
+ rc = pci_reset_function_locked(oct->pci_dev, PCI_RESET_ANY |
+ PCI_RESET_NOSAVERESTORE);
if (rc != 0)
dev_err(&oct->pci_dev->dev, "Error %d resetting PCI function %d\n",
@@ -4856,11 +4856,13 @@ int pci_reset_function_locked(struct pci_dev *dev, u32 reset_type)
if (!dev->reset_fn)
return -ENOTTY;
- pci_dev_save_and_disable(dev);
+ if (!(reset_type & PCI_RESET_NOSAVERESTORE))
+ pci_dev_save_and_disable(dev);
rc = __pci_reset_function_locked(dev, reset_type);
- pci_dev_restore(dev);
+ if (!(reset_type & PCI_RESET_NOSAVERESTORE))
+ pci_dev_restore(dev);
return rc;
}
@@ -35,6 +35,7 @@ int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vmai,
int pci_probe_reset_function(struct pci_dev *dev, u32 reset_type);
int pci_bridge_secondary_bus_reset(struct pci_dev *dev);
+int __pci_reset_function_locked(struct pci_dev *dev, u32 reset_type);
/**
* struct pci_platform_pm_ops - Firmware PM callbacks
@@ -105,7 +105,8 @@ static void pcistub_device_release(struct kref *kref)
/* Call the reset function which does not take lock as this
* is called from "unbind" which takes a device_lock mutex.
*/
- __pci_reset_function_locked(dev, PCI_RESET_ANY);
+ pci_reset_function_locked(dev, PCI_RESET_ANY |
+ PCI_RESET_NOSAVERESTORE);
if (pci_load_and_free_saved_state(dev, &dev_data->pci_saved_state))
dev_info(&dev->dev, "Could not reload PCI state\n");
else
@@ -283,7 +284,8 @@ void pcistub_put_pci_dev(struct pci_dev *dev)
* (so it's ready for the next domain)
*/
device_lock_assert(&dev->dev);
- __pci_reset_function_locked(dev, PCI_RESET_ANY);
+ pci_reset_function_locked(dev, PCI_RESET_ANY |
+ PCI_RESET_NOSAVERESTORE);
dev_data = pci_get_drvdata(dev);
ret = pci_load_saved_state(dev, dev_data->pci_saved_state);
@@ -417,7 +419,8 @@ static int pcistub_init_device(struct pci_dev *dev)
dev_err(&dev->dev, "Could not store PCI conf saved state!\n");
else {
dev_dbg(&dev->dev, "resetting (FLR, D3, etc) the device\n");
- __pci_reset_function_locked(dev, PCI_RESET_ANY);
+ pci_reset_function_locked(dev, PCI_RESET_ANY |
+ PCI_RESET_NOSAVERESTORE);
pci_restore_state(dev);
}
/* Now disable the device (this also ensures some private device
@@ -893,17 +893,21 @@ enum {
* recovery. Using this option directly and bypassing hotplug driver may
* cause a deadlock if platform supports hotplug. Please refer to
* PCI_RESET_LINK and let the PCI core do the hotplug detection.
+ *
+ * PCI_RESET_NOSAVERESTORE tells the PCI core to not save the card context
+ * before performing a reset and restore the values after reset.
*/
#define PCI_RESET_DEV_SPECIFIC (1 << 0)
#define PCI_RESET_FLR (1 << 1)
#define PCI_RESET_PM (1 << 2)
#define PCI_RESET_SLOT (1 << 3)
#define PCI_RESET_BUS (1 << 4)
+#define PCI_RESET_NOSAVERESTORE (1 << 5)
-#define PCI_RESET_ANY (~0)
#define PCI_RESET_FUNC (PCI_RESET_DEV_SPECIFIC | \
PCI_RESET_FLR | PCI_RESET_PM)
#define PCI_RESET_LINK (PCI_RESET_SLOT | PCI_RESET_BUS)
+#define PCI_RESET_ANY (PCI_RESET_FUNC | PCI_RESET_LINK)
/* These external functions are only available when PCI support is enabled */
#ifdef CONFIG_PCI
@@ -1167,7 +1171,6 @@ u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev,
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, u32 reset_type);
int pci_reset_function_locked(struct pci_dev *dev, u32 reset_type);
int pci_try_reset_function(struct pci_dev *dev, u32 reset_type);
The difference between pci_reset_function_locked() and __pci_reset_function_locked() is the saving and restoring of the registers. Unify these API by adding saverestore argument that caller passes. Signed-off-by: Sinan Kaya <okaya@kernel.org> --- drivers/infiniband/hw/hfi1/pcie.c | 3 ++- drivers/net/ethernet/cavium/liquidio/lio_main.c | 3 ++- drivers/pci/pci.c | 6 ++++-- drivers/pci/pci.h | 1 + drivers/xen/xen-pciback/pci_stub.c | 9 ++++++--- include/linux/pci.h | 7 +++++-- 6 files changed, 20 insertions(+), 9 deletions(-)