Skip to content

Commit

Permalink
ACPI / PM: Do not power manage devices in unknown initial states
Browse files Browse the repository at this point in the history
In general, for ACPI device power management to work, the initial
power states of devices must be known (otherwise, we wouldn't be able
to keep track of power resources, for example).  Hence, if it is
impossible to determine the initial ACPI power states of some
devices, they can't be regarded as power-manageable using ACPI.

For this reason, modify acpi_bus_get_power_flags() to clear the
power_manageable flag if acpi_bus_init_power() fails and add some
extra fallback code to acpi_bus_init_power() to cover broken
BIOSes that provide _PS0/_PS3 without _PSC for some devices.

Verified to work on my HP nx6325 that has this problem.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Peter Wu <lekensteyn@gmail.com>
  • Loading branch information
Rafael J. Wysocki committed Feb 1, 2013
1 parent dde3bb4 commit b378549
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
6 changes: 6 additions & 0 deletions drivers/acpi/device_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,12 @@ int acpi_bus_init_power(struct acpi_device *device)
result = acpi_dev_pm_explicit_set(device, state);
if (result)
return result;
} else if (state == ACPI_STATE_UNKNOWN) {
/* No power resources and missing _PSC? Try to force D0. */
state = ACPI_STATE_D0;
result = acpi_dev_pm_explicit_set(device, state);
if (result)
return result;
}
device->power.state = state;
return 0;
Expand Down
5 changes: 4 additions & 1 deletion drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,10 @@ static void acpi_bus_get_power_flags(struct acpi_device *device)
device->power.flags.power_resources)
device->power.states[ACPI_STATE_D3_COLD].flags.os_accessible = 1;

acpi_bus_init_power(device);
if (acpi_bus_init_power(device)) {
acpi_free_power_resources_lists(device);
device->flags.power_manageable = 0;
}
}

static void acpi_bus_get_flags(struct acpi_device *device)
Expand Down

0 comments on commit b378549

Please sign in to comment.