diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-14 13:15:49 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-14 13:15:49 +0200 |
| commit | ec4b8ddcd3b9836ae06fcf8d7f6442e7d9f0c6e6 (patch) | |
| tree | 673b095f144484f42e94c8d89860acb7f5e5aab5 /drivers/pci/pci.c | |
| parent | 1633b396105b69efe8bfc83e33662276cc8a7675 (diff) | |
| parent | c7b5a4e6e8fbef8fdf2c529f953000d24c561339 (diff) | |
| download | linux-ec4b8ddcd3b9836ae06fcf8d7f6442e7d9f0c6e6.tar.gz linux-ec4b8ddcd3b9836ae06fcf8d7f6442e7d9f0c6e6.tar.bz2 linux-ec4b8ddcd3b9836ae06fcf8d7f6442e7d9f0c6e6.zip | |
Merge branch 'pm-pci'
* pm-pci:
PCI / PM: Fix native PME handling during system suspend/resume
PCI / PM: Restore PME Enable after config space restoration
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index d88edf5c563b..af0cc3456dc1 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1801,7 +1801,11 @@ static void __pci_pme_active(struct pci_dev *dev, bool enable) pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, pmcsr); } -static void pci_pme_restore(struct pci_dev *dev) +/** + * pci_pme_restore - Restore PME configuration after config space restore. + * @dev: PCI device to update. + */ +void pci_pme_restore(struct pci_dev *dev) { u16 pmcsr; @@ -1811,6 +1815,7 @@ static void pci_pme_restore(struct pci_dev *dev) pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr); if (dev->wakeup_prepared) { pmcsr |= PCI_PM_CTRL_PME_ENABLE; + pmcsr &= ~PCI_PM_CTRL_PME_STATUS; } else { pmcsr &= ~PCI_PM_CTRL_PME_ENABLE; pmcsr |= PCI_PM_CTRL_PME_STATUS; @@ -1907,14 +1912,9 @@ int pci_enable_wake(struct pci_dev *dev, pci_power_t state, bool enable) { int ret = 0; - /* - * Don't do the same thing twice in a row for one device, but restore - * PME Enable in case it has been updated by config space restoration. - */ - if (!!enable == !!dev->wakeup_prepared) { - pci_pme_restore(dev); + /* Don't do the same thing twice in a row for one device. */ + if (!!enable == !!dev->wakeup_prepared) return 0; - } /* * According to "PCI System Architecture" 4th ed. by Tom Shanley & Don |