]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit - drivers/pci/pci.c
PCI / PM: Restore PME Enable after config space restoration
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 12 Jul 2017 01:05:39 +0000 (03:05 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 12 Jul 2017 21:09:21 +0000 (23:09 +0200)
commit0ce3fcaff92908c370334ce3b9111aeea71159d6
treeb60bc7ee980415b48df2bb167f2c5ee1efe0d6e9
parentde3ef1eb1cd0cc3a75f7a3661e10ed827f370ab8
PCI / PM: Restore PME Enable after config space restoration

Commit dc15e71eefc7 (PCI / PM: Restore PME Enable if skipping wakeup
setup) introduced a mechanism by which the PME Enable bit can be
restored by pci_enable_wake() if dev->wakeup_prepared is set in
case it has been overwritten by PCI config space restoration.

However, that commit overlooked the fact that on some systems (Dell
XPS13 9360 in particular) the AML handling wakeup events checks PME
Status and PME Enable and it won't trigger a Notify() for devices
where those bits are not set while it is running.

That happens during resume from suspend-to-idle when pci_restore_state()
invoked by pci_pm_default_resume_early() clears PME Enable before the
wakeup events are processed by AML, effectively causing those wakeup
events to be ignored.

Fix this issue by restoring the PME Enable configuration right after
pci_restore_state() has been called instead of doing that in
pci_enable_wake().

Fixes: dc15e71eefc7 (PCI / PM: Restore PME Enable if skipping wakeup setup)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/pci-driver.c
drivers/pci/pci.c
drivers/pci/pci.h