diff options
author | Bob Moore <robert.moore@intel.com> | 2015-05-20 22:30:59 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-21 21:22:20 -0400 |
commit | 9ab8cf1b699758d502411ad9d131ff521ca01cd6 (patch) | |
tree | a0af9b6fb1a795e093a89f9f18101c8c200e260d | |
parent | aeb823bbacc2a3aaee29eda5875b58a049fa1f78 (diff) |
ACPICA: ACPI 6.0: Add changes for LPIT table.
ACPICA commit d527908bb33a3ed515cfb349cbec57121deafcc8
Second subtable type was removed from the July 2014 LPIT
document.
Link: https://github.com/acpica/acpica/commit/d527908b
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | include/acpi/actbl2.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index cafdeb50fbdf..93f85e8f7e9a 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h | |||
@@ -824,7 +824,7 @@ struct acpi_ivrs_memory { | |||
824 | * | 824 | * |
825 | * LPIT - Low Power Idle Table | 825 | * LPIT - Low Power Idle Table |
826 | * | 826 | * |
827 | * Conforms to "ACPI Low Power Idle Table (LPIT) and _LPD Proposal (DRAFT)" | 827 | * Conforms to "ACPI Low Power Idle Table (LPIT)" July 2014. |
828 | * | 828 | * |
829 | ******************************************************************************/ | 829 | ******************************************************************************/ |
830 | 830 | ||
@@ -846,8 +846,7 @@ struct acpi_lpit_header { | |||
846 | 846 | ||
847 | enum acpi_lpit_type { | 847 | enum acpi_lpit_type { |
848 | ACPI_LPIT_TYPE_NATIVE_CSTATE = 0x00, | 848 | ACPI_LPIT_TYPE_NATIVE_CSTATE = 0x00, |
849 | ACPI_LPIT_TYPE_SIMPLE_IO = 0x01, | 849 | ACPI_LPIT_TYPE_RESERVED = 0x01 /* 1 and above are reserved */ |
850 | ACPI_LPIT_TYPE_RESERVED = 0x02 /* 2 and above are reserved */ | ||
851 | }; | 850 | }; |
852 | 851 | ||
853 | /* Masks for Flags field above */ | 852 | /* Masks for Flags field above */ |
@@ -870,21 +869,6 @@ struct acpi_lpit_native { | |||
870 | u64 counter_frequency; | 869 | u64 counter_frequency; |
871 | }; | 870 | }; |
872 | 871 | ||
873 | /* 0x01: Simple I/O based LPI structure */ | ||
874 | |||
875 | struct acpi_lpit_io { | ||
876 | struct acpi_lpit_header header; | ||
877 | struct acpi_generic_address entry_trigger; | ||
878 | u32 trigger_action; | ||
879 | u64 trigger_value; | ||
880 | u64 trigger_mask; | ||
881 | struct acpi_generic_address minimum_idle_state; | ||
882 | u32 residency; | ||
883 | u32 latency; | ||
884 | struct acpi_generic_address residency_counter; | ||
885 | u64 counter_frequency; | ||
886 | }; | ||
887 | |||
888 | /******************************************************************************* | 872 | /******************************************************************************* |
889 | * | 873 | * |
890 | * MCFG - PCI Memory Mapped Configuration table and subtable | 874 | * MCFG - PCI Memory Mapped Configuration table and subtable |