Skip to contentSkip to conversation

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

PATCH In review Rafael J. Wysocki 2 participants 3 messages May 16, 2019 – May 27, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

From: Rafael J. Wysocki <[email protected]>

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.

---
 drivers/acpi/device_pm.c |    4 ++--
 drivers/pci/pci-acpi.c   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/pci/pci-acpi.c +2 -1
Index: linux-pm/drivers/pci/pci-acpi.c
===================================================================
@@ -666,7 +666,8 @@ static bool acpi_pci_need_resume(struct
 	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)
drivers/acpi/device_pm.c +2 -2
Index: linux-pm/drivers/acpi/device_pm.c
===================================================================
@@ -952,8 +952,8 @@ static bool acpi_dev_needs_resume(struct
 	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)
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

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.

Quoted 7 lines

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.

#2 lore raw
In reply to Rafael J. Wysocki
Quoted 38 lines · CEST Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

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.

---
 drivers/acpi/device_pm.c |    4 ++--
 drivers/pci/pci-acpi.c   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Index: linux-pm/drivers/pci/pci-acpi.c
===================================================================

drivers/pci/pci-acpi.c +2 -1
@@ -666,7 +666,8 @@ static bool acpi_pci_need_resume(struct
 	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)

Index: linux-pm/drivers/acpi/device_pm.c
===================================================================

drivers/acpi/device_pm.c static bool acpi_dev_needs_resume(struct · line 959

Quoted 10 lines
drivers/acpi/device_pm.c +2 -2
@@ -952,8 +952,8 @@ static bool acpi_dev_needs_resume(struct
 	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)

Bjorn, I've assumed no concerns or objections from you regarding this one and queued this up.

If that assumption is incorrect, please let me know.