Commit 4917f718 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/hotplug' 

- Ignore Link Down/Up caused by error-induced Hot Reset so endpoint driver
  can remain bound to device during error recovery (Lukas Wunner)

- Remove unused resume err_handler (Lukas Wunner)

- Remove unused pcie_port_bus_{,un}register() declarations (Lukas Wunner)

- Skip compiling err.c when CONFIG_PCIEAER not set (Lukas Wunner)

* pci/hotplug:
  PCI/ERR: Reduce compile time for CONFIG_PCIEAER=n
  PCI/portdrv: Remove unused pcie_port_bus_{,un}register() declarations
  PCI/portdrv: Remove unused resume err_handler
  PCI: pciehp: Ignore Link Down/Up caused by error-induced Hot Reset
  PCI/portdrv: Rename pm_iter() to pcie_port_device_iter()
parents d03c426f f9a6c8ad

drivers/pci/hotplug/pciehp.h

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ int pciehp_get_attention_status(struct hotplug_slot *hotplug_slot, u8 *status); 
int pciehp_set_raw_indicator_status(struct hotplug_slot *h_slot, u8 status);

int pciehp_get_raw_indicator_status(struct hotplug_slot *h_slot, u8 *status);



int pciehp_slot_reset(struct pcie_device *dev);



static inline const char *slot_name(struct controller *ctrl)

{

	return hotplug_slot_name(&ctrl->hotplug_slot);

drivers/pci/hotplug/pciehp_core.c

+2 −0
Original line number Diff line number Diff line
@@ -351,6 +351,8 @@ static struct pcie_port_service_driver hpdriver_portdrv = { 
	.runtime_suspend = pciehp_runtime_suspend,

	.runtime_resume	= pciehp_runtime_resume,

#endif	/* PM */



	.slot_reset	= pciehp_slot_reset,

};



int __init pcie_hp_init(void)

drivers/pci/hotplug/pciehp_hpc.c

+26 −0
Original line number Diff line number Diff line
@@ -862,6 +862,32 @@ void pcie_disable_interrupt(struct controller *ctrl) 
	pcie_write_cmd(ctrl, 0, mask);

}



/**

 * pciehp_slot_reset() - ignore link event caused by error-induced hot reset

 * @dev: PCI Express port service device

 *

 * Called from pcie_portdrv_slot_reset() after AER or DPC initiated a reset

 * further up in the hierarchy to recover from an error.  The reset was

 * propagated down to this hotplug port.  Ignore the resulting link flap.

 * If the link failed to retrain successfully, synthesize the ignored event.

 * Surprise removal during reset is detected through Presence Detect Changed.

 */

int pciehp_slot_reset(struct pcie_device *dev)

{

	struct controller *ctrl = get_service_data(dev);



	if (ctrl->state != ON_STATE)

		return 0;



	pcie_capability_write_word(dev->port, PCI_EXP_SLTSTA,

				   PCI_EXP_SLTSTA_DLLSC);



	if (!pciehp_check_link_active(ctrl))

		pciehp_request(ctrl, PCI_EXP_SLTSTA_DLLSC);



	return 0;

}



/*

 * pciehp has a 1:1 bus:slot relationship so we ultimately want a secondary

 * bus reset of the bridge, but at the same time we want to ensure that it is

drivers/pci/pci-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -1537,7 +1537,7 @@ static int pci_uevent(struct device *dev, struct kobj_uevent_env *env) 
	return 0;

}



#if defined(CONFIG_PCIEPORTBUS) || defined(CONFIG_EEH)

#if defined(CONFIG_PCIEAER) || defined(CONFIG_EEH)

/**

 * pci_uevent_ers - emit a uevent during recovery path of PCI device

 * @pdev: PCI device undergoing error recovery

drivers/pci/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -2243,6 +2243,7 @@ int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state) 
}

EXPORT_SYMBOL_GPL(pci_set_pcie_reset_state);



#ifdef CONFIG_PCIEAER

void pcie_clear_device_status(struct pci_dev *dev)

{

	u16 sta;
@@ -2250,6 +2251,7 @@ void pcie_clear_device_status(struct pci_dev *dev) 
	pcie_capability_read_word(dev, PCI_EXP_DEVSTA, &sta);

	pcie_capability_write_word(dev, PCI_EXP_DEVSTA, sta);

}

#endif



/**

 * pcie_clear_root_pme_status - Clear root port PME interrupt status.