Linux PCI subsystem development
 help / color / mirror / Atom feed
* [PATCH v3] ACPI: PM: Avoid initializing power management for absent devices
@ 2026-11-17 19:09 Rafael J. Wysocki
  2026-11-17 19:24 ` sashiko-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Rafael J. Wysocki @ 2026-11-17 19:09 UTC (permalink / raw)
  To: Linux ACPI; +Cc: Linux PM, Linux PCI, Mika Westerberg, Alan Borzeszkowski

From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>

Commit 2f4ddf2bd1ba ("ACPI: scan: Stop calling acpi_bus_init_power()
early") removed a device presence check from acpi_bus_init_power() which
in some cases causes power management to be initialized for an ACPI
device object and never used going forward.  That in turn may prevent
power management from working as expected for other devices.

Namely, if a given ACPI device object is not enabled according to its
_STA, find_child_checks() will return an error for it which will prevent
it from being used as an ACPI companion for a PCI device.  Thus if
acpi_device_init_power() initializes power management for it and its
initial power state turns out to be different from D3cold, it may stay
in that power state forever.  If it has power resources and they are
"on" during the initialization, they may be reference-counted and never
turned off.  If they are shared with other devices, they will prevent
power from going down after attempting to put the other devices into
low-power states.

To prevent that from happening, restore the device presence check in
acpi_bus_init_power(), but also adjust find_child_checks() to return
an error for absent devices (instead of doing that for disabled devices)
in accordance with acpi_bus_init_power() and the existing check in
acpi_bus_attach().

Fixes: 2f4ddf2bd1ba ("ACPI: scan: Stop calling acpi_bus_init_power() early")
Reported-by: Alan Borzeszkowski <alan.borzeszkowski@linux.intel.com>
Tested-by: Alan Borzeszkowski <alan.borzeszkowski@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

v2 -> v3:
   * Also set power.state to ACPI_D_STATE_INVALID if the device is
     not present when acpi_bus_init_power() runs (Sashiko)

v1 -> v2:
   * Clear power_manageable when returning an error early from
     acpi_bus_init_power() (Sashiko)
   * Print debug message when that happens

Quick turnaround because it fixes a recent regression.

---
 drivers/acpi/device_pm.c |   15 +++++++++++++--
 drivers/acpi/glue.c      |    8 ++------
 2 files changed, 15 insertions(+), 8 deletions(-)

--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -365,14 +365,25 @@ int acpi_bus_init_power(struct acpi_devi
 	 * fails, ACPI power management will not be used for the device going
 	 * forward.
 	 */
+	if (!acpi_device_is_present(device)) {
+		acpi_handle_debug(device->handle,
+				  "Device not present, ACPI PM disabled\n");
+		result = -ENXIO;
+		goto fail;
+	}
+
 	result = acpi_device_init_power(device);
 	if (result) {
-		device->flags.power_manageable = 0;
-		device->power.state = ACPI_D_STATE_INVALID;
 		acpi_handle_info(device->handle,
 				 "Initial power state undetermined, ACPI PM disabled\n");
+		goto fail;
 	}
 
+	return 0;
+
+fail:
+	device->flags.power_manageable = 0;
+	device->power.state = ACPI_D_STATE_INVALID;
 	return result;
 }
 
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -109,14 +109,10 @@ static bool acpi_dev_has_children(struct
 
 static int find_child_checks(struct acpi_device *adev, bool check_children)
 {
-	unsigned long long sta;
-	acpi_status status;
-
 	if (check_children && !acpi_dev_has_children(adev))
 		return -ENODEV;
 
-	status = acpi_evaluate_integer(adev->handle, "_STA", NULL, &sta);
-	if (status == AE_NOT_FOUND) {
+	if (!acpi_has_method(adev->handle, METHOD_NAME__STA)) {
 		/*
 		 * Special case: backlight device objects without _STA are
 		 * preferred to other objects with the same _ADR value, because
@@ -128,7 +124,7 @@ static int find_child_checks(struct acpi
 		return FIND_CHILD_MIN_SCORE;
 	}
 
-	if (ACPI_FAILURE(status) || !(sta & ACPI_STA_DEVICE_ENABLED))
+	if (!acpi_device_is_present(adev))
 		return -ENODEV;
 
 	/*




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v3] ACPI: PM: Avoid initializing power management for absent devices
  2026-11-17 19:09 [PATCH v3] ACPI: PM: Avoid initializing power management for absent devices Rafael J. Wysocki
@ 2026-11-17 19:24 ` sashiko-bot
  0 siblings, 0 replies; 2+ messages in thread
From: sashiko-bot @ 2026-11-17 19:24 UTC (permalink / raw)
  To: Rafael J. Wysocki; +Cc: Linux PCI

> From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
> 
> Commit 2f4ddf2bd1ba ("ACPI: scan: Stop calling acpi_bus_init_power()
> early") removed a device presence check from acpi_bus_init_power() which
> in some cases causes power management to be initialized for an ACPI
> device object and never used going forward.  That in turn may prevent
> power management from working as expected for other devices.
> 
> Namely, if a given ACPI device object is not enabled according to its
> _STA, find_child_checks() will return an error for it which will prevent
> it from being used as an ACPI companion for a PCI device.  Thus if
> acpi_device_init_power() initializes power management for it and its
> initial power state turns out to be different from D3cold, it may stay
> in that power state forever.  If it has power resources and they are
> "on" during the initialization, they may be reference-counted and never
> turned off.  If they are shared with other devices, they will prevent
> power from going down after attempting to put the other devices into
> low-power states.
> 
> To prevent that from happening, restore the device presence check in
> acpi_bus_init_power(), but also adjust find_child_checks() to return
> an error for absent devices (instead of doing that for disabled devices)
> in accordance with acpi_bus_init_power() and the existing check in
> acpi_bus_attach().
> 
> Fixes: 2f4ddf2bd1ba ("ACPI: scan: Stop calling acpi_bus_init_power() early")
> Reported-by: Alan Borzeszkowski <alan.borzeszkowski@linux.intel.com>
> Tested-by: Alan Borzeszkowski <alan.borzeszkowski@linux.intel.com>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Sashiko has reviewed this patch and found no issues.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/13013440.O9o76ZdvQC@rafael.j.wysocki?part=1


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-17 19:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-17 19:09 [PATCH v3] ACPI: PM: Avoid initializing power management for absent devices Rafael J. Wysocki
2026-11-17 19:24 ` sashiko-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox