3 files changed, 20 insertions, 1 deletions

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 968f57087ce0..e4ad00a3448e 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -162,6 +162,8 @@ extern int pciehp_unconfigure_device(struct slot *p_slot);
 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)
 {
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 74f4f7bc8db9..ae3fe318b8fd 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -514,6 +514,24 @@ static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)
 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
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 342cfc6c1de8..e5eb9106e7be 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -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)
 {