diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-05 15:20:00 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-05 15:20:00 -0600 |
commit | db288c9c5f9db45610dab3940377625132b4af41 (patch) | |
tree | ef859024757b4b468eb33aa5d9f879aa28fdd754 /drivers/pci/pci-label.c | |
parent | 448bd857d48e69b33ef323739dc6d8ca20d4cda7 (diff) | |
download | talos-obmc-linux-db288c9c5f9db45610dab3940377625132b4af41.tar.gz talos-obmc-linux-db288c9c5f9db45610dab3940377625132b4af41.zip |
PCI / PM: restore the original behavior of pci_set_power_state()
Commit cc2893b6 (PCI: Ensure we re-enable devices on resume)
addressed the problem with USB not being powered after resume on
recent Lenovo machines, but it did that in a suboptimal way.
Namely, it should have changed the relevant code paths only,
which are pci_pm_resume_noirq() and pci_pm_restore_noirq() supposed
to restore the device's power and standard configuration registers
after system resume from suspend or hibernation. Instead, however,
it modified pci_set_power_state() which is executed in several
other situations too. That resulted in some undesirable effects,
like attempting to change a device's power state in the same way
multiple times in a row (up to as many as 4 times in a row in the
snd_hda_intel driver).
Fix the bug addressed by commit cc2893b6 in an alternative way,
by forcibly powering up all devices in pci_pm_default_resume_early(),
which is called by pci_pm_resume_noirq() and pci_pm_restore_noirq()
to restore the device's power and standard configuration registers,
and modifying pci_pm_runtime_resume() to avoid the forcible power-up
if not necessary. Then, revert the changes made by commit cc2893b6
to make the confusion introduced by it go away.
Acked-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/pci-label.c')
0 files changed, 0 insertions, 0 deletions