diff options
| author | Lin Ming <ming.m.lin@intel.com> | 2012-04-23 09:03:49 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-05-05 01:19:52 -0400 |
| commit | 1cc0c998fdf2cb665d625fb565a0d6db5c81c639 (patch) | |
| tree | 2768315b4d2217ea16082947bf995edfc40d5faf /include | |
| parent | ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d (diff) | |
| download | linux-3.10-1cc0c998fdf2cb665d625fb565a0d6db5c81c639.tar.gz linux-3.10-1cc0c998fdf2cb665d625fb565a0d6db5c81c639.tar.bz2 linux-3.10-1cc0c998fdf2cb665d625fb565a0d6db5c81c639.zip | |
ACPI: Fix D3hot v D3cold confusion
Before this patch, ACPI_STATE_D3 incorrectly referenced D3hot
in some places, but D3cold in other places.
After this patch, ACPI_STATE_D3 always means ACPI_STATE_D3_COLD;
and all references to D3hot use ACPI_STATE_D3_HOT.
ACPI's _PR3 method is used to enter both D3hot and D3cold states.
What distinguishes D3hot from D3cold is the presence _PR3
(Power Resources for D3hot) If these resources are all ON,
then the state is D3hot. If _PR3 is not present,
or all _PR0 resources for the devices are OFF,
then the state is D3cold.
This patch applies after Linux-3.4-rc1.
A future syntax cleanup may remove ACPI_STATE_D3
to emphasize that it always means ACPI_STATE_D3_COLD.
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Reviewed-by: Aaron Lu <aaron.lu@amd.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/actypes.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index eba66043cf1..e8bcc4742e0 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -499,9 +499,10 @@ typedef u64 acpi_integer; #define ACPI_STATE_D0 (u8) 0 #define ACPI_STATE_D1 (u8) 1 #define ACPI_STATE_D2 (u8) 2 -#define ACPI_STATE_D3 (u8) 3 -#define ACPI_STATE_D3_COLD (u8) 4 -#define ACPI_D_STATES_MAX ACPI_STATE_D3_COLD +#define ACPI_STATE_D3_HOT (u8) 3 +#define ACPI_STATE_D3 (u8) 4 +#define ACPI_STATE_D3_COLD ACPI_STATE_D3 +#define ACPI_D_STATES_MAX ACPI_STATE_D3 #define ACPI_D_STATE_COUNT 5 #define ACPI_STATE_C0 (u8) 0 |