aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug
diff options
context:
space:
mode:
authorMark Lord <lkml@rtr.ca>2007-11-28 18:12:00 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 18:04:23 -0500
commitcd2fe83a81510acfd1ae29b8ffe04f7ef675c993 (patch)
treed445b9d21069284f782df86b097c687a4ff6d46c /drivers/pci/hotplug
parent08e7a7d27d71e92305980033ec03c0a86b3efb2d (diff)
PCIE: Make use of the previously split out pcie_init_enable_events() function
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 <mlord@pobox.com> Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r--drivers/pci/hotplug/pciehp.h2
-rw-r--r--drivers/pci/hotplug/pciehp_core.c18
-rw-r--r--drivers/pci/hotplug/pciehp_ctrl.c1
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);
162extern void pciehp_queue_pushbutton_work(struct work_struct *work); 162extern void pciehp_queue_pushbutton_work(struct work_struct *work);
163int pcie_init(struct controller *ctrl, struct pcie_device *dev); 163int pcie_init(struct controller *ctrl, struct pcie_device *dev);
164int pciehp_enable_slot(struct slot *p_slot); 164int pciehp_enable_slot(struct slot *p_slot);
165int pciehp_disable_slot(struct slot *p_slot);
166int pcie_init_hardware(struct controller *ctrl, struct pcie_device *dev);
165 167
166static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) 168static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
167{ 169{
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)
514static int pciehp_resume (struct pcie_device *dev) 514static int pciehp_resume (struct pcie_device *dev)
515{ 515{
516 printk("%s ENTRY\n", __FUNCTION__); 516 printk("%s ENTRY\n", __FUNCTION__);
517 if (pciehp_force) {
518 struct pci_dev *pdev = dev->port;
519 struct controller *ctrl = pci_get_drvdata(pdev);
520 struct slot *t_slot;
521 u8 status;
522
523 /* reinitialize the chipset's event detection logic */
524 pcie_init_hardware(ctrl, dev);
525
526 t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
527
528 /* Check if slot is occupied */
529 t_slot->hpc_ops->get_adapter_status(t_slot, &status);
530 if (status)
531 pciehp_enable_slot(t_slot);
532 else
533 pciehp_disable_slot(t_slot);
534 }
517 return 0; 535 return 0;
518} 536}
519#endif 537#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 @@
37#include "pciehp.h" 37#include "pciehp.h"
38 38
39static void interrupt_event_handler(struct work_struct *work); 39static void interrupt_event_handler(struct work_struct *work);
40static int pciehp_disable_slot(struct slot *p_slot);
41 40
42static int queue_interrupt_event(struct slot *p_slot, u32 event_type) 41static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
43{ 42{