|
@@ -42,17 +42,6 @@ __setup("pcie_ports=", pcie_port_setup);
|
|
|
|
|
|
/* global data */
|
|
|
|
|
|
-static int pcie_portdrv_restore_config(struct pci_dev *dev)
|
|
|
-{
|
|
|
- int retval;
|
|
|
-
|
|
|
- retval = pci_enable_device(dev);
|
|
|
- if (retval)
|
|
|
- return retval;
|
|
|
- pci_set_master(dev);
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
#ifdef CONFIG_PM
|
|
|
static int pcie_port_runtime_suspend(struct device *dev)
|
|
|
{
|
|
@@ -160,19 +149,6 @@ static pci_ers_result_t pcie_portdrv_mmio_enabled(struct pci_dev *dev)
|
|
|
return PCI_ERS_RESULT_RECOVERED;
|
|
|
}
|
|
|
|
|
|
-static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev)
|
|
|
-{
|
|
|
- /* If fatal, restore cfg space for possible link reset at upstream */
|
|
|
- if (dev->error_state == pci_channel_io_frozen) {
|
|
|
- dev->state_saved = true;
|
|
|
- pci_restore_state(dev);
|
|
|
- pcie_portdrv_restore_config(dev);
|
|
|
- pci_enable_pcie_error_reporting(dev);
|
|
|
- }
|
|
|
-
|
|
|
- return PCI_ERS_RESULT_RECOVERED;
|
|
|
-}
|
|
|
-
|
|
|
static int resume_iter(struct device *device, void *data)
|
|
|
{
|
|
|
struct pcie_device *pcie_device;
|
|
@@ -208,7 +184,6 @@ static const struct pci_device_id port_pci_ids[] = { {
|
|
|
static const struct pci_error_handlers pcie_portdrv_err_handler = {
|
|
|
.error_detected = pcie_portdrv_error_detected,
|
|
|
.mmio_enabled = pcie_portdrv_mmio_enabled,
|
|
|
- .slot_reset = pcie_portdrv_slot_reset,
|
|
|
.resume = pcie_portdrv_err_resume,
|
|
|
};
|
|
|
|