ACPI: PM: Fix regression in acpi_device_set_power()
PATCH 1/1 ACPI: PM: Fix regression in acpi_device_set_power()
From: Rafael J. Wysocki <[email protected]>
Commit f850a48a0799 ("ACPI: PM: Allow transitions to D0 to occur in special cases") overlooked the fact that acpi_power_transition() may change the power.state value for the target device and if that happens, it may confuse acpi_device_set_power() and cause it to omit the _PS0 evaluation which on some systems is necessary to change power states of devices from low-power to D0.
Fix that by saving the current value of power.state for the target device before passing it to acpi_power_transition() and using the saved value in a subsequent check.
--- drivers/acpi/device_pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/acpi/device_pm.c +3 -1
@@ -236,13 +236,15 @@ int acpi_device_set_power(struct acpi_deif (device->power.flags.power_resources) result =acpi_power_transition (device, target_state); }else { +int cur_state = device->power.state; +if (device->power.flags.power_resources) { result =acpi_power_transition (device,ACPI_STATE_D0 );if (result) goto end; } -if (device->power.state ==ACPI_STATE_D0 ) { +if (cur_state ==ACPI_STATE_D0 ) {int psc;/* Nothing to do here if _PSC is not present. */
Quoted 9 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
f850a48a0799("ACPI: PM: Allow transitions to D0 to occur in special cases") overlooked the fact thatacpi_power_transition()may change the power.state value for the target device and if that happens, it may confuseacpi_device_set_power()and cause it to omit the_PS0evaluation which on some systems is necessary to change power states of devices from low-power to D0.
Quoted 8 lines
Fix that by saving the current value of power.state for the target device before passing it to
acpi_power_transition()and using the saved value in a subsequent check.Fixes f850a48a0799 ("ACPI: PM: Allow transitions to D0 to occur in special cases")Reported-by Kai-Heng Feng <[email protected]>Reported-by Mario Limonciello <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
Quoted 25 lines
--- drivers/acpi/device_pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)Index:
linux-pm/drivers/acpi/device_pm.c
===================================================================drivers/acpi/device_pm.c +3
-1@@ -236,13 +236,15 @@ int acpi_device_set_power(struct acpi_deif (device->power.flags.power_resources) result =acpi_power_transition (device, target_state); }else { +int cur_state = device->power.state; +if (device->power.flags.power_resources) { result =acpi_power_transition (device,ACPI_STATE_D0 );if (result) goto end; } -if (device->power.state ==ACPI_STATE_D0 ) { +if (cur_state ==ACPI_STATE_D0 ) {int psc;/* Nothing to do here if _PSC is not present. */
[email protected]
Tested-byQuoted 24 lines
-----Original Message-----
From: Kai-Heng Feng <[email protected]>
Sent: Thursday, August 1, 2019 1:11 AM
To: Rafael J. Wysocki
Cc: Linux ACPI; Linux PM; Linux PCI; LKML; Mika Westerberg; Bjorn Helgaas; Limonciello, Mario
Subject: Re: [PATCH] ACPI: PM: Fix regression inacpi_device_set_power()Quoted 13 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
f850a48a0799("ACPI: PM: Allow transitions to D0 to occur in special cases") overlooked the fact thatacpi_power_transition()may change the power.state value for the target device and if that happens, it may confuseacpi_device_set_power()and cause it to omit the_PS0evaluation which on some systems is necessary to change power states of devices from low-power to D0.Fix that by saving the current value of power.state for the target device before passing it to
acpi_power_transition()and using the saved value in a subsequent check.
Quoted 7 lines
Quoted 5 lines
Fixes f850a48a0799 ("ACPI: PM: Allow transitions to D0 to occur inspecial cases")
Reported-by Kai-Heng Feng <[email protected]>Reported-by Mario Limonciello <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>Tested-by Kai-Heng Feng <[email protected]>
Quoted 29 lines
Quoted 7 lines
--- drivers/acpi/device_pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)Index:
linux-pm/drivers/acpi/device_pm.c==============================================================
=====Quoted 19 lines
drivers/acpi/device_pm.c +3
-1@@ -236,13 +236,15 @@ int acpi_device_set_power(struct acpi_deif (device->power.flags.power_resources) result =acpi_power_transition (device, target_state); }else { +int cur_state = device->power.state; +if (device->power.flags.power_resources) { result =acpi_power_transition (device,ACPI_STATE_D0 );if (result) goto end; } -if (device->power.state ==ACPI_STATE_D0 ) { +if (cur_state ==ACPI_STATE_D0 ) {int psc;/* Nothing to do here if _PSC is not present. */