aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-02-08 13:16:33 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2010-02-26 14:39:12 -0500
commita1e4d72cd3024999bfb6703092ea271438805c89 (patch)
tree853a289d73ad9ffb04038fc493d209e980a3ef9b
parent09c09bc618a4ceec387c57542031b4fc35826e16 (diff)
PM: Allow PCI devices to suspend/resume asynchronously
Set power.async_suspend for all PCI devices and PCIe port services, so that they can be suspended and resumed in parallel with other devices they don't depend on in a known way (i.e. devices which are not their parents or children). This only affects the "regular" suspend and resume stages, which means in particular that the restoration of the PCI devices' standard configuration registers during resume will still be carried out synchronously (at the "early" resume stage). Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--drivers/pci/pci.c1
-rw-r--r--drivers/pci/pcie/portdrv_core.c1
-rw-r--r--drivers/pci/probe.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index f4a2738bf0bf..2b9ac9e594af 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1540,6 +1540,7 @@ void pci_pm_init(struct pci_dev *dev)
1540 int pm; 1540 int pm;
1541 u16 pmc; 1541 u16 pmc;
1542 1542
1543 device_enable_async_suspend(&dev->dev);
1543 dev->wakeup_prepared = false; 1544 dev->wakeup_prepared = false;
1544 dev->pm_cap = 0; 1545 dev->pm_cap = 0;
1545 1546
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 0d34ff415399..e73effbe402c 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -285,6 +285,7 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq)
285 pci_name(pdev), 285 pci_name(pdev),
286 get_descriptor_id(pdev->pcie_type, service)); 286 get_descriptor_id(pdev->pcie_type, service));
287 device->parent = &pdev->dev; 287 device->parent = &pdev->dev;
288 device_enable_async_suspend(device);
288 289
289 retval = device_register(device); 290 retval = device_register(device);
290 if (retval) 291 if (retval)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 270d069819f7..2a943090a3b7 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1436,6 +1436,7 @@ struct pci_bus * pci_create_bus(struct device *parent,
1436 if (error) 1436 if (error)
1437 goto dev_reg_err; 1437 goto dev_reg_err;
1438 b->bridge = get_device(dev); 1438 b->bridge = get_device(dev);
1439 device_enable_async_suspend(b->bridge);
1439 1440
1440 if (!parent) 1441 if (!parent)
1441 set_dev_node(b->bridge, pcibus_to_node(b)); 1442 set_dev_node(b->bridge, pcibus_to_node(b));