leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI / PM: Fix consistency check for power resources during resume

Browse Source 
During system resume we check if there are power resources that have
been turned off by the BIOS, but our reference counters for them
are nonzero (they need to be turned on then).  It turns out, however,
that we also need to check the opposite, i.e. if there are power
resources that have been turned on by the BIOS, but our reference
counters for them are zero (which means that no devices are going
to need them any time soon) and we should turn them off.

Make the power resources resume code do the additional check and
turn off the unused power resources as appropriate.

This change has been tested on HP nx6325.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki 2013-01-25 21:51:57 +01:00
parent 18a387099b
commit 660b1113e0
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/acpi/power.c
View File

@ -299,9 +299,22 @@ static int acpi_power_on(struct acpi_power_resource *resource)
return result; return result;
} }
static int __acpi_power_off(struct acpi_power_resource *resource)
{
acpi_status status;
status = acpi_evaluate_object(resource->device.handle, "_OFF",
NULL, NULL);
if (ACPI_FAILURE(status))
return -ENODEV;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Power resource [%s] turned off\n",
resource->name));
return 0;
}
static int acpi_power_off(struct acpi_power_resource *resource) static int acpi_power_off(struct acpi_power_resource *resource)
{ {
acpi_status status = AE_OK;
int result = 0; int result = 0;
mutex_lock(&resource->resource_lock); mutex_lock(&resource->resource_lock);
@ -317,17 +330,12 @@ static int acpi_power_off(struct acpi_power_resource *resource)
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Power resource [%s] still in use\n", "Power resource [%s] still in use\n",
resource->name)); resource->name));
goto unlock; } else {
result = __acpi_power_off(resource);
if (result)
resource->ref_count++;
} }
status = acpi_evaluate_object(resource->device.handle, "_OFF", NULL, NULL);
if (ACPI_FAILURE(status))
result = -ENODEV;
else
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Power resource [%s] turned off\n",
resource->name));
unlock: unlock:
mutex_unlock(&resource->resource_lock); mutex_unlock(&resource->resource_lock);
@ -851,10 +859,17 @@ void acpi_resume_power_resources(void)
mutex_lock(&resource->resource_lock); mutex_lock(&resource->resource_lock);
result = acpi_power_get_state(resource->device.handle, &state); result = acpi_power_get_state(resource->device.handle, &state);
if (!result && state == ACPI_POWER_RESOURCE_STATE_OFF if (result)
continue;
if (state == ACPI_POWER_RESOURCE_STATE_OFF
&& resource->ref_count) { && resource->ref_count) {
dev_info(&resource->device.dev, "Turning ON\n"); dev_info(&resource->device.dev, "Turning ON\n");
__acpi_power_on(resource); __acpi_power_on(resource);
} else if (state == ACPI_POWER_RESOURCE_STATE_ON
&& !resource->ref_count) {
dev_info(&resource->device.dev, "Turning OFF\n");
__acpi_power_off(resource);
} }
mutex_unlock(&resource->resource_lock); mutex_unlock(&resource->resource_lock);