diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-11-29 22:05:52 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-11-29 22:05:52 +0100 |
commit | 3e407c16f571b723c6d446e707d9e60cf53cd415 (patch) | |
tree | ef376219e656b4a3ec94e0ed2ff43e6acaa72ced /include/acpi | |
parent | ae6b3e54aa52cd29965b8e4e47000ed2c5d78eb8 (diff) | |
parent | 087286585d8b6e63ffc1e56cbbbcda72ce254e22 (diff) | |
download | blackbird-obmc-linux-3e407c16f571b723c6d446e707d9e60cf53cd415.tar.gz blackbird-obmc-linux-3e407c16f571b723c6d446e707d9e60cf53cd415.zip |
Merge back earlier ACPICA changes for 4.21.
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acpixf.h | 2 | ||||
-rw-r--r-- | include/acpi/actbl3.h | 23 |
2 files changed, 24 insertions, 1 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 0c19b68bf060..0c967d02c202 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -12,7 +12,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20181003 +#define ACPI_CA_VERSION 0x20181031 #include <acpi/acconfig.h> #include <acpi/actypes.h> diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h index 501f341d1d92..ea1ca49c9c1b 100644 --- a/include/acpi/actbl3.h +++ b/include/acpi/actbl3.h @@ -365,6 +365,29 @@ struct acpi_table_tcpa_server { * ******************************************************************************/ +/* Revision 3 */ + +struct acpi_table_tpm23 { + struct acpi_table_header header; /* Common ACPI table header */ + u32 reserved; + u64 control_address; + u32 start_method; +}; + +/* Value for start_method above */ + +#define ACPI_TPM23_ACPI_START_METHOD 2 + +/* + * Optional trailer for revision 3. If start method is 2, there is a 4 byte + * reserved area of all zeros. + */ +struct acpi_tmp23_trailer { + u32 reserved; +}; + +/* Revision 4 */ + struct acpi_table_tpm2 { struct acpi_table_header header; /* Common ACPI table header */ u16 platform_class; |