Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACPI/PCI: PM: Add missing wakeup.flags.valid checks

Browse Source 
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>
This commit is contained in:
Rafael J. Wysocki 2019-05-16 12:42:20 +02:00
parent cd6c84d8f0
commit 9a51c6b1f9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/device_pm.c
View File

@ -952,8 +952,8 @@ static bool acpi_dev_needs_resume(struct device *dev, struct acpi_device *adev)
u32 sys_target = acpi_target_system_state(); u32 sys_target = acpi_target_system_state();
int ret, state; int ret, state;
if (!pm_runtime_suspended(dev) || !adev || if (!pm_runtime_suspended(dev) || !adev || (adev->wakeup.flags.valid &&
device_may_wakeup(dev) != !!adev->wakeup.prepare_count) device_may_wakeup(dev) != !!adev->wakeup.prepare_count))
return true; return true;
if (sys_target == ACPI_STATE_S0) if (sys_target == ACPI_STATE_S0)

3
drivers/pci/pci-acpi.c
View File

@ -733,7 +733,8 @@ static bool acpi_pci_need_resume(struct pci_dev *dev)
if (!adev || !acpi_device_power_manageable(adev)) if (!adev || !acpi_device_power_manageable(adev))
return false; 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; return true;
if (acpi_target_system_state() == ACPI_STATE_S0) if (acpi_target_system_state() == ACPI_STATE_S0)