From: Mark Lord Make use of the previously split out pcie_init_enable_events() function to reinitialize the hotplug hardware on resume from suspend, but only when pciehp_force==1. Otherwise behaviour is unmodified. Signed-off-by: Mark Lord Signed-off-by: Kristen Carlson Accardi Cc: Andrew Morton , Theodore Ts'o , greg@kroah.com, --- drivers/pci/hotplug/pciehp.h | 2 ++ drivers/pci/hotplug/pciehp_core.c | 18 ++++++++++++++++++ drivers/pci/hotplug/pciehp_ctrl.c | 1 - 3 files changed, 20 insertions(+), 1 deletion(-) Index: 2.6-git/drivers/pci/hotplug/pciehp_ctrl.c =================================================================== --- 2.6-git.orig/drivers/pci/hotplug/pciehp_ctrl.c 2007-10-23 10:07:17.000000000 -0700 +++ 2.6-git/drivers/pci/hotplug/pciehp_ctrl.c 2007-10-23 10:07:17.000000000 -0700 @@ -37,7 +37,6 @@ #include "pciehp.h" static void interrupt_event_handler(struct work_struct *work); -static int pciehp_disable_slot(struct slot *p_slot); static int queue_interrupt_event(struct slot *p_slot, u32 event_type) { Index: 2.6-git/drivers/pci/hotplug/pciehp.h =================================================================== --- 2.6-git.orig/drivers/pci/hotplug/pciehp.h 2007-10-23 10:07:17.000000000 -0700 +++ 2.6-git/drivers/pci/hotplug/pciehp.h 2007-10-23 10:07:17.000000000 -0700 @@ -162,6 +162,8 @@ extern int pciehp_unconfigure_device(str extern void pciehp_queue_pushbutton_work(struct work_struct *work); int pcie_init(struct controller *ctrl, struct pcie_device *dev); int pciehp_enable_slot(struct slot *p_slot); +int pciehp_disable_slot(struct slot *p_slot); +int pcie_init_hardware(struct controller *ctrl, struct pcie_device *dev); static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) { Index: 2.6-git/drivers/pci/hotplug/pciehp_core.c =================================================================== --- 2.6-git.orig/drivers/pci/hotplug/pciehp_core.c 2007-10-23 10:07:17.000000000 -0700 +++ 2.6-git/drivers/pci/hotplug/pciehp_core.c 2007-10-23 10:07:17.000000000 -0700 @@ -514,6 +514,24 @@ static int pciehp_suspend (struct pcie_d static int pciehp_resume (struct pcie_device *dev) { printk("%s ENTRY\n", __FUNCTION__); + if (pciehp_force) { + struct pci_dev *pdev = dev->port; + struct controller *ctrl = pci_get_drvdata(pdev); + struct slot *t_slot; + u8 status; + + /* reinitialize the chipset's event detection logic */ + pcie_init_hardware(ctrl, dev); + + t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset); + + /* Check if slot is occupied */ + t_slot->hpc_ops->get_adapter_status(t_slot, &status); + if (status) + pciehp_enable_slot(t_slot); + else + pciehp_disable_slot(t_slot); + } return 0; } #endif