diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2012-03-29 08:09:38 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-30 07:47:00 +0200 |
| commit | 3ebc81b8937d2bc1d0d0064bed29434dfce490aa (patch) | |
| tree | d468d5668d49d50bb36ce99b461ba8e8f26221dd | |
| parent | Linux 3.3 (diff) | |
| download | linux-3ebc81b8937d2bc1d0d0064bed29434dfce490aa.tar.xz linux-3ebc81b8937d2bc1d0d0064bed29434dfce490aa.zip | |
ACPI: Introduce ACPI D3_COLD state support
If a device has _PR3, it means the device supports D3_COLD.
Add the ability to validate and enter D3_COLD state in ACPI.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/power.c | 4 | ||||
| -rw-r--r-- | drivers/acpi/scan.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 9ac2a9fa90ff..0d681fb7428b 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -500,14 +500,14 @@ int acpi_power_transition(struct acpi_device *device, int state) { int result; - if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3)) + if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD)) return -EINVAL; if (device->power.state == state) return 0; if ((device->power.state < ACPI_STATE_D0) - || (device->power.state > ACPI_STATE_D3)) + || (device->power.state > ACPI_STATE_D3_COLD)) return -ENODEV; /* TBD: Resources must be ordered. */ diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 8ab80bafe3f1..571396cf6110 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -885,6 +885,13 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) acpi_bus_add_power_resource(ps->resources.handles[j]); } + /* The exist of _PR3 indicates D3Cold support */ + if (i == ACPI_STATE_D3) { + status = acpi_get_handle(device->handle, object_name, &handle); + if (ACPI_SUCCESS(status)) + device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1; + } + /* Evaluate "_PSx" to see if we can do explicit sets */ object_name[2] = 'S'; status = acpi_get_handle(device->handle, object_name, &handle); |