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

[ Upstream commit 9a51c6b1f9e0239a9435db036b212498a2a3b75c ]

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: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index a7c2673ffd36e8a8287a40182fae189e6b71688e..1806260938e89aebee6d0f125cce9b44448c8c4f 100644 (file)
--- 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 f8436d1c4d45fe6039930cc7dc12f08120812f9b..f7218c1673ceba05bbf153271360b2c0d7869291 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -625,7 +625,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)