diff options
author | Zhang Rui <rui.zhang@intel.com> | 2012-03-29 02:09:38 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-03-30 01:47:00 -0400 |
commit | 3ebc81b8937d2bc1d0d0064bed29434dfce490aa (patch) | |
tree | d468d5668d49d50bb36ce99b461ba8e8f26221dd /drivers/acpi | |
parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) |
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>
Diffstat (limited to 'drivers/acpi')
-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) | |||
500 | { | 500 | { |
501 | int result; | 501 | int result; |
502 | 502 | ||
503 | if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3)) | 503 | if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD)) |
504 | return -EINVAL; | 504 | return -EINVAL; |
505 | 505 | ||
506 | if (device->power.state == state) | 506 | if (device->power.state == state) |
507 | return 0; | 507 | return 0; |
508 | 508 | ||
509 | if ((device->power.state < ACPI_STATE_D0) | 509 | if ((device->power.state < ACPI_STATE_D0) |
510 | || (device->power.state > ACPI_STATE_D3)) | 510 | || (device->power.state > ACPI_STATE_D3_COLD)) |
511 | return -ENODEV; | 511 | return -ENODEV; |
512 | 512 | ||
513 | /* TBD: Resources must be ordered. */ | 513 | /* 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) | |||
885 | acpi_bus_add_power_resource(ps->resources.handles[j]); | 885 | acpi_bus_add_power_resource(ps->resources.handles[j]); |
886 | } | 886 | } |
887 | 887 | ||
888 | /* The exist of _PR3 indicates D3Cold support */ | ||
889 | if (i == ACPI_STATE_D3) { | ||
890 | status = acpi_get_handle(device->handle, object_name, &handle); | ||
891 | if (ACPI_SUCCESS(status)) | ||
892 | device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1; | ||
893 | } | ||
894 | |||
888 | /* Evaluate "_PSx" to see if we can do explicit sets */ | 895 | /* Evaluate "_PSx" to see if we can do explicit sets */ |
889 | object_name[2] = 'S'; | 896 | object_name[2] = 'S'; |
890 | status = acpi_get_handle(device->handle, object_name, &handle); | 897 | status = acpi_get_handle(device->handle, object_name, &handle); |