diff options
| author | Keith Busch | 2018-09-20 18:27:12 +0200 |
|---|---|---|
| committer | Bjorn Helgaas | 2018-09-26 21:23:14 +0200 |
| commit | bdb5ac85777de67c909c9ad4327f03f7648b543f (patch) | |
| tree | 06ffd1c0d73efa4807579a2a5b9bc04da8fcca1b /drivers/pci/pci.h | |
| parent | PCI/ERR: Use slot reset if available (diff) | |
| download | kernel-qcow2-linux-bdb5ac85777de67c909c9ad4327f03f7648b543f.tar.gz kernel-qcow2-linux-bdb5ac85777de67c909c9ad4327f03f7648b543f.tar.xz kernel-qcow2-linux-bdb5ac85777de67c909c9ad4327f03f7648b543f.zip | |
PCI/ERR: Handle fatal error recovery
We don't need to be paranoid about the topology changing while handling an
error. If the device has changed in a hotplug capable slot, we can rely on
the presence detection handling to react to a changing topology.
Restore the fatal error handling behavior that existed before merging DPC
with AER with 7e9084b36740 ("PCI/AER: Handle ERR_FATAL with removal and
re-enumeration of devices").
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Sinan Kaya <okaya@kernel.org>
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index b4ada8c383a8..9b279805489f 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -433,8 +433,8 @@ static inline int pci_dev_specific_disable_acs_redir(struct pci_dev *dev) #endif /* PCI error reporting and recovery */ -void pcie_do_fatal_recovery(struct pci_dev *dev, u32 service); -void pcie_do_nonfatal_recovery(struct pci_dev *dev); +void pcie_do_recovery(struct pci_dev *dev, enum pci_channel_state state, + u32 service); bool pcie_wait_for_link(struct pci_dev *pdev, bool active); #ifdef CONFIG_PCIEASPM |