PCI ACPI: Rework PCI handling of wake-up

* Introduce function acpi_pm_device_sleep_wake() for enabling and
  disabling the system wake-up capability of devices that are power
  manageable by ACPI.

* Introduce function acpi_bus_can_wakeup() allowing other (dependent)
  subsystems to check if ACPI is able to enable the system wake-up
  capability of given device.

* Introduce callback .sleep_wake() in struct pci_platform_pm_ops and
  for the ACPI PCI 'driver' make it use acpi_pm_device_sleep_wake().

* Introduce callback .can_wakeup() in struct pci_platform_pm_ops and
  for the ACPI 'driver' make it use acpi_bus_can_wakeup().

* Move the PME# handlig code out of pci_enable_wake() and split it
  into two functions, pci_pme_capable() and pci_pme_active(),
  allowing the caller to check if given device is capable of
  generating PME# from given power state and to enable/disable the
  device's PME# functionality, respectively.

* Modify pci_enable_wake() to use the new ACPI callbacks and the new
  PME#-related functions.

* Drop the generic .platform_enable_wakeup() callback that is not
  used any more.

* Introduce device_set_wakeup_capable() that will set the
  power.can_wakeup flag of given device.

* Rework PCI device PM initialization so that, if given device is
  capable of generating wake-up events, either natively through the
  PME# mechanism, or with the help of the platform, its
  power.can_wakeup flag is set and its power.should_wakeup flag is
  unset as appropriate.

* Make ACPI set the power.can_wakeup flag for devices found to be
  wake-up capable by it.

* Make the ACPI wake-up code enable/disable GPEs for devices that
  have the wakeup.flags.prepared flag set (which means that their
  wake-up power has been enabled).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 3 insertions, 44 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 2f0ae70710d6..b1724cf31b66 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -860,49 +860,6 @@ int pci_cfg_space_size_ext(struct pci_dev *dev)
         return PCI_CFG_SPACE_SIZE;
 }
 
-/**
- * pci_disable_pme - Disable the PME function of PCI device
- * @dev: PCI device affected
- * -EINVAL is returned if PCI device doesn't support PME.
- * Zero is returned if the PME is supported and can be disabled.
- */
-static int pci_disable_pme(struct pci_dev *dev)
-{
-        int pm;
-        u16 value;
-
-        /* find PCI PM capability in list */
-        pm = pci_find_capability(dev, PCI_CAP_ID_PM);
-
-        /* If device doesn't support PM Capabilities, it means that PME is
-         * not supported.
-         */
-        if (!pm)
-                return -EINVAL;
-        /* Check device's ability to generate PME# */
-        pci_read_config_word(dev, pm + PCI_PM_PMC, &value);
-
-        value &= PCI_PM_CAP_PME_MASK;
-        /* Check if it can generate PME# */
-        if (!value) {
-                /*
-                 * If it is zero, it means that PME is still unsupported
-                 * although there exists the PM capability.
-                 */
-                return -EINVAL;
-        }
-
-        pci_read_config_word(dev, pm + PCI_PM_CTRL, &value);
-
-        /* Clear PME_Status by writing 1 to it */
-        value |= PCI_PM_CTRL_PME_STATUS ;
-        /* Disable PME enable bit */
-        value &= ~PCI_PM_CTRL_PME_ENABLE;
-        pci_write_config_word(dev, pm + PCI_PM_CTRL, value);
-
-        return 0;
-}
-
 int pci_cfg_space_size(struct pci_dev *dev)
 {
         int pos;
@@ -1010,7 +967,6 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
         }
 
         pci_vpd_pci22_init(dev);
-        pci_disable_pme(dev);
 
         return dev;
 }
@@ -1031,6 +987,9 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
         /* Fix up broken headers */
         pci_fixup_device(pci_fixup_header, dev);
 
+        /* Initialize power management of the device */
+        pci_pm_init(dev);
+
         /*
          * Add the device to our list of discovered devices
          * and the bus list for fixup functions, etc.