mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
PCI/PM: Resume device before shutdown
Some actions during shutdown need device to be in D0 state, such as MSI shutdown etc, so resume device before shutdown. Without this patch, a device may not be enumerated after a kexec because the corresponding bridge is not in D0, so that configuration space of the device is not accessible. Signed-off-by: Huang Ying <ying.huang@intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> CC: stable@vger.kernel.org # v3.6+
This commit is contained in:
parent
90b5c1d7c4
commit
3ff2de9ba1
1 changed files with 2 additions and 10 deletions
|
@ -398,6 +398,8 @@ static void pci_device_shutdown(struct device *dev)
|
|||
struct pci_dev *pci_dev = to_pci_dev(dev);
|
||||
struct pci_driver *drv = pci_dev->driver;
|
||||
|
||||
pm_runtime_resume(dev);
|
||||
|
||||
if (drv && drv->shutdown)
|
||||
drv->shutdown(pci_dev);
|
||||
pci_msi_shutdown(pci_dev);
|
||||
|
@ -408,16 +410,6 @@ static void pci_device_shutdown(struct device *dev)
|
|||
* continue to do DMA
|
||||
*/
|
||||
pci_disable_device(pci_dev);
|
||||
|
||||
/*
|
||||
* Devices may be enabled to wake up by runtime PM, but they need not
|
||||
* be supposed to wake up the system from its "power off" state (e.g.
|
||||
* ACPI S5). Therefore disable wakeup for all devices that aren't
|
||||
* supposed to wake up the system at this point. The state argument
|
||||
* will be ignored by pci_enable_wake().
|
||||
*/
|
||||
if (!device_may_wakeup(dev))
|
||||
pci_enable_wake(pci_dev, PCI_UNKNOWN, false);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
|
|
Loading…
Reference in a new issue