aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-01-08 10:16:40 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-01-08 10:16:40 +0000
commitb1e513ae332082a234a3d724be3ba49353a710c6 (patch)
tree8ef6fa1828818d5e1a6497858faaa541c0bf2c33 /include
parent8671016261cd5dfba1042aef0a632a77b0d387a2 (diff)
parent4a42fa0ee20b51b326f6494cb50218b52471a261 (diff)
downloadqemu-b1e513ae332082a234a3d724be3ba49353a710c6.zip
qemu-b1e513ae332082a234a3d724be3ba49353a710c6.tar.gz
qemu-b1e513ae332082a234a3d724be3ba49353a710c6.tar.bz2
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-12-22-1' into staging
Merge tpm 2017/12/22 v1 # gpg: Signature made Fri 22 Dec 2017 20:03:37 GMT # gpg: using RSA key 0x75AD65802A0B4211 # gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211 * remotes/stefanberger/tags/pull-tpm-2017-12-22-1: acpi: Update TPM2 ACPI table to more recent specs tpm: Implement tpm_sized_buffer_reset tpm_tis: merge r/w_offset into rw_offset tpm_tis: move r/w_offsets to TPMState tpm_tis: merge read and write buffer into single buffer tpm_tis: move buffers from localities into common location tpm_tis: remove TPMSizeBuffer usage tpm_tis: limit size of buffer from backend tpm_tis: convert uint32_t to size_t tpm_emulator: Add a caching layer for the TPM Established flag Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/hw/acpi/acpi-defs.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 72be675..80c8099 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -558,8 +558,8 @@ typedef struct Acpi20Tcpa Acpi20Tcpa;
/*
* TPM2
*
- * Following Level 00, Rev 00.37 of specs:
- * http://www.trustedcomputinggroup.org/resources/tcg_acpi_specification
+ * Following Version 1.2, Revision 8 of specs:
+ * https://trustedcomputinggroup.org/tcg-acpi-specification/
*/
struct Acpi20TPM2 {
ACPI_TABLE_HEADER_DEF
@@ -567,6 +567,9 @@ struct Acpi20TPM2 {
uint16_t reserved;
uint64_t control_area_address;
uint32_t start_method;
+ uint8_t start_method_params[12];
+ uint32_t log_area_minimum_length;
+ uint64_t log_area_start_address;
} QEMU_PACKED;
typedef struct Acpi20TPM2 Acpi20TPM2;