diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-16 12:42:20 +0200 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-16 12:21:37 -0400 |
| commit | 99044cd6f2e1bbdae5e6e3292dbda8333306b3de (patch) | |
| tree | 708c39db0a5ea33a8d05867a889ba7ab499190ca | |
| parent | 48b6dc50918f4c7d8716e581cb54c6fdc8e34ee9 (diff) | |
| download | linux-yocto-99044cd6f2e1bbdae5e6e3292dbda8333306b3de.tar.gz linux-yocto-99044cd6f2e1bbdae5e6e3292dbda8333306b3de.tar.bz2 linux-yocto-99044cd6f2e1bbdae5e6e3292dbda8333306b3de.zip | |
ACPI/PCI: PM: Add missing wakeup.flags.valid checks
commit 9a51c6b1f9e0239a9435db036b212498a2a3b75c upstream.
Both acpi_pci_need_resume() and acpi_dev_needs_resume() check if the
current ACPI wakeup configuration of the device matches what is
expected as far as system wakeup from sleep states is concerned, as
reflected by the device_may_wakeup() return value for the device.
However, they only should do that if wakeup.flags.valid is set for
the device's ACPI companion, because otherwise the wakeup.prepare_count
value for it is meaningless.
Add the missing wakeup.flags.valid checks to these functions.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | drivers/acpi/device_pm.c | 4 | ||||
| -rw-r--r-- | drivers/pci/pci-acpi.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index a7c2673ffd36..1806260938e8 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -948,8 +948,8 @@ static bool acpi_dev_needs_resume(struct device *dev, struct acpi_device *adev) u32 sys_target = acpi_target_system_state(); int ret, state; - if (!pm_runtime_suspended(dev) || !adev || - device_may_wakeup(dev) != !!adev->wakeup.prepare_count) + if (!pm_runtime_suspended(dev) || !adev || (adev->wakeup.flags.valid && + device_may_wakeup(dev) != !!adev->wakeup.prepare_count)) return true; if (sys_target == ACPI_STATE_S0) diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index d2b04ab37308..aac98dca0419 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -642,7 +642,8 @@ static bool acpi_pci_need_resume(struct pci_dev *dev) if (!adev || !acpi_device_power_manageable(adev)) return false; - if (device_may_wakeup(&dev->dev) != !!adev->wakeup.prepare_count) + if (adev->wakeup.flags.valid && + device_may_wakeup(&dev->dev) != !!adev->wakeup.prepare_count) return true; if (acpi_target_system_state() == ACPI_STATE_S0) |