On Wednesday, July 31, 2019 6:04:29 PM CEST Kai-Heng Feng wrote:
> Hi,
>
> After commit "ACPI: PM: Allow transitions to D0 to occur in special cases”,
> Thunderbolt on XPS 9380 spews the following when it runtime resumes:
> [ 36.136554] pci_raw_set_power_state: 25 callbacks suppressed
> [ 36.136558] pcieport 0000:03:00.0: Refused to change power state,
> currently in D3
> [ 36.143850] pcieport 0000:04:04.0: Refused to change power state,
> currently in D3
> [ 36.150796] pcieport 0000:04:00.0: Refused to change power state,
> currently in D3
> [ 36.157138] pcieport 0000:04:01.0: Refused to change power state,
> currently in D3
> [ 36.162635] pcieport 0000:04:02.0: Refused to change power state,
> currently in D3
Thanks for identifying the offending commit and sorry for the breakage.
The patch below should fix it.
---
drivers/acpi/device_pm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: linux-pm/drivers/acpi/device_pm.c
===================================================================
--- linux-pm.orig/drivers/acpi/device_pm.c
+++ linux-pm/drivers/acpi/device_pm.c
@@ -236,13 +236,15 @@ int acpi_device_set_power(struct acpi_de
if (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. */
