Skip to content

Commit

Permalink
ACPI: PM: Avoid evaluating _PS3 on transitions from D3hot to D3cold
Browse files Browse the repository at this point in the history
If the power state of a device with ACPI PM is changed from D3hot to
D3cold, it merely is a matter of dropping references to additional
power resources (specifically, those in the list returned by _PR3),
and the _PS3 method should not be invoked for the device then (as
it has already been evaluated during the previous transition to
D3hot).

Fixes: 20dacb7 (ACPI / PM: Rework device power management to follow ACPI 6)
Signed-off-by: Rafael J. Wysocki <[email protected]>
Reviewed-by: Mika Westerberg <[email protected]>
  • Loading branch information
rafaeljw committed Jun 27, 2019
1 parent a3487d8 commit 21ba237
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/acpi/device_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,15 @@ int acpi_device_set_power(struct acpi_device *device, int state)
return -ENODEV;
}

result = acpi_dev_pm_explicit_set(device, state);
if (result)
goto end;
/*
* If the device goes from D3hot to D3cold, _PS3 has been
* evaluated for it already, so skip it in that case.
*/
if (device->power.state < ACPI_STATE_D3_HOT) {
result = acpi_dev_pm_explicit_set(device, state);
if (result)
goto end;
}

if (device->power.flags.power_resources)
result = acpi_power_transition(device, target_state);
Expand Down

0 comments on commit 21ba237

Please sign in to comment.