mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
ACPI: PM: Avoid initializing power management for absent devices
Commit2f4ddf2bd1("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:2f4ddf2bd1("ACPI: scan: Stop calling acpi_bus_init_power() early") Reported-by: Alan Borzeszkowski <[email protected]> Tested-by: Alan Borzeszkowski <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Tested-by: Mika Westerberg <[email protected]> Reviewed-by: Mika Westerberg <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Rafael J. Wysocki <[email protected]>
This commit is contained in:
@@ -365,14 +365,25 @@ int acpi_bus_init_power(struct acpi_device *device)
|
||||
* fails, ACPI power management will not be used for the device going
|
||||
* forward.
|
||||
*/
|
||||
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");
|
||||
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) {
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
+2
-6
@@ -108,14 +108,10 @@ static bool acpi_dev_has_children(struct acpi_device *adev)
|
||||
|
||||
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
|
||||
@@ -127,7 +123,7 @@ static int find_child_checks(struct acpi_device *adev, bool check_children)
|
||||
return FIND_CHILD_MIN_SCORE;
|
||||
}
|
||||
|
||||
if (ACPI_FAILURE(status) || !(sta & ACPI_STA_DEVICE_ENABLED))
|
||||
if (!acpi_device_is_present(adev))
|
||||
return -ENODEV;
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user