Message ID | 3012059.oderKuhLE3@kreacher (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Rafael Wysocki |
Headers | show |
Series | ACPI: PM: Fix two issues in acpi_device_set_power() | expand |
On Tue, Jun 25, 2019 at 02:04:45PM +0200, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > 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: 20dacb71ad28 (ACPI / PM: Rework device power management to follow ACPI 6) > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
On Tuesday, June 25, 2019 4:11:16 PM CEST Mika Westerberg wrote: > On Tue, Jun 25, 2019 at 02:04:45PM +0200, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > 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: 20dacb71ad28 (ACPI / PM: Rework device power management to follow ACPI 6) > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> > Thanks! I've queued this one and the [2/2] with your tag for 5.3.
Index: linux-pm/drivers/acpi/device_pm.c =================================================================== --- linux-pm.orig/drivers/acpi/device_pm.c +++ linux-pm/drivers/acpi/device_pm.c @@ -215,9 +215,15 @@ int acpi_device_set_power(struct acpi_de 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);