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>

authored by Rafael J. Wysocki and committed by Jesse Barnes cbbc2f6b 27be54a6

+6 -4
+6 -4
drivers/pci/pci-driver.c
··· 434 434 { 435 435 pci_fixup_device(pci_fixup_resume, pci_dev); 436 436 437 - if (!pci_is_bridge(pci_dev)) 438 - pci_enable_wake(pci_dev, PCI_D0, false); 437 + if (pci_is_bridge(pci_dev)) 438 + return 0; 439 439 440 + pci_enable_wake(pci_dev, PCI_D0, false); 440 441 return pci_pm_reenable_device(pci_dev); 441 442 } 442 443 443 444 static void pci_pm_default_suspend_generic(struct pci_dev *pci_dev) 444 445 { 445 - /* If device is enabled at this point, disable it */ 446 - pci_disable_enabled_device(pci_dev); 446 + /* If a non-bridge device is enabled at this point, disable it */ 447 + if (!pci_is_bridge(pci_dev)) 448 + pci_disable_enabled_device(pci_dev); 447 449 /* 448 450 * Save state with interrupts enabled, because in principle the bus the 449 451 * device is on may be put into a low power state after this code runs.