summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-25 21:51:57 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-25 21:51:57 +0100
commit660b1113e0f33a476952cb2cbcb5c9831e7ff4cd (patch)
treede08984b801858b0be37a34cdc8493a896f39742 /drivers/acpi/power.c
parent18a387099b3e3fd901cc706f708b163aa45347b6 (diff)
downloadlinux-660b1113e0f33a476952cb2cbcb5c9831e7ff4cd.tar.gz
linux-660b1113e0f33a476952cb2cbcb5c9831e7ff4cd.tar.bz2
linux-660b1113e0f33a476952cb2cbcb5c9831e7ff4cd.zip
ACPI / PM: Fix consistency check for power resources during resume
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>
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r--drivers/acpi/power.c37
1 files changed, 26 insertions, 11 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 9466f56b938f..b820528a5fa3 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -299,9 +299,22 @@ static int acpi_power_on(struct acpi_power_resource *resource)
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)
{
- acpi_status status = AE_OK;
int result = 0;
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,
"Power resource [%s] still in use\n",
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:
mutex_unlock(&resource->resource_lock);
@@ -851,10 +859,17 @@ void acpi_resume_power_resources(void)
mutex_lock(&resource->resource_lock);
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) {
dev_info(&resource->device.dev, "Turning ON\n");
__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);