diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-03 19:34:09 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-03 19:34:09 +0300 |
commit | 92b7e4923fdbeda9b86b1398127449d5353f9123 (patch) | |
tree | b5c59aaf0d436c19fe3f534bcba05c08105c7864 /include/acpi/actbl3.h | |
parent | c6fe44d96fc1536af5b11cd859686453d1b7bfd1 (diff) | |
parent | 85467f63a05c43364ba0b90d0c05bb89191543fa (diff) | |
download | linux-92b7e4923fdbeda9b86b1398127449d5353f9123.tar.xz |
Merge tag 'tpmdd-next-v5.9' of git://git.infradead.org/users/jjs/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"An issue was fixed with the TPM space buffer size. The buffer is used
to store in-TPM objects while swapped out of the TPM for a /dev/tpmrm0
session. The code incorrectly used PAGE_SIZE, which obviously can
vary. With these changes the buffer has a fixed size of 16 kB.
In addition, this contains support for acquiring TPM even log from
TPM2 ACPI table. This method is used by QEMU in particular"
* tag 'tpmdd-next-v5.9' of git://git.infradead.org/users/jjs/linux-tpmdd:
tpm: Add support for event log pointer found in TPM2 ACPI table
acpi: Extend TPM2 ACPI table with missing log fields
tpm: Unify the mismatching TPM space buffer sizes
tpm: Require that all digests are present in TCG_PCR_EVENT2 structures
Diffstat (limited to 'include/acpi/actbl3.h')
-rw-r--r-- | include/acpi/actbl3.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h index b0b163b9efc6..bdcac69fa6bd 100644 --- a/include/acpi/actbl3.h +++ b/include/acpi/actbl3.h @@ -415,6 +415,13 @@ struct acpi_table_tpm2 { /* Platform-specific data follows */ }; +/* Optional trailer for revision 4 holding platform-specific data */ +struct acpi_tpm2_phy { + u8 start_method_specific[12]; + u32 log_area_minimum_length; + u64 log_area_start_address; +}; + /* Values for start_method above */ #define ACPI_TPM2_NOT_ALLOWED 0 |