PCI PM: Do not disable and enable bridges during suspend-resume

It is a mistake to disable and enable PCI bridges and PCI Express
ports during suspend-resume, at least at the time when it is
currently done.  Disabling them may lead to problems with accessing
devices behind them and they should be automatically enabled when
their standard config spaces are restored.  Fix this by not attempting
to disable bridges during suspend and enable them during resume.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index fdb6a697e05..ac6c9e493f4 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -434,16 +434,18 @@ static int pci_pm_default_resume(struct pci_dev *pci_dev)
 {
         pci_fixup_device(pci_fixup_resume, pci_dev);
 
-        if (!pci_is_bridge(pci_dev))
-                pci_enable_wake(pci_dev, PCI_D0, false);
+        if (pci_is_bridge(pci_dev))
+                return 0;
 
+        pci_enable_wake(pci_dev, PCI_D0, false);
         return pci_pm_reenable_device(pci_dev);
 }
 
 static void pci_pm_default_suspend_generic(struct pci_dev *pci_dev)
 {
-        /* If device is enabled at this point, disable it */
-        pci_disable_enabled_device(pci_dev);
+        /* If a non-bridge device is enabled at this point, disable it */
+        if (!pci_is_bridge(pci_dev))
+                pci_disable_enabled_device(pci_dev);
         /*
          * Save state with interrupts enabled, because in principle the bus the
          * device is on may be put into a low power state after this code runs.