acpi: tpm: Do not build TCPA table for TPM 2
PATCH 1/1 acpi: tpm: Do not build TCPA table for TPM 2
From: Stefan Berger <[email protected]>
Do not build a TCPA table for TPM 2 anymore but create the log area when building the TPM2 table. The TCPA table is only needed for TPM 1.2.
--- hw/i386/acpi-build.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
hw/i386/acpi-build.c +8 -4
@@ -2317,6 +2317,10 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) tpm2_ptr->log_area_minimum_length =cpu_to_le32 (TPM_LOG_AREA_MINIMUM_SIZE ); +acpi_data_push (tcpalog,le32_to_cpu (tpm2_ptr->log_area_minimum_length)); +bios_linker_loader_alloc (linker,ACPI_BUILD_TPMLOG_FILE , tcpalog,1 , + false); +/* log area start address to be filled by Guest linker */ bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, log_addr_offset, log_addr_size,
@@ -2848,10 +2852,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)build_hpet (tables_blob, tables->linker); }if (misc.tpm_version !=TPM_VERSION_UNSPEC ) { -acpi_add_table (table_offsets, tables_blob); -build_tpm_tcpa (tables_blob, tables->linker, tables->tcpalog); - -if (misc.tpm_version ==TPM_VERSION_2_0 ) { +if (misc.tpm_version ==TPM_VERSION_1_2 ) { +acpi_add_table (table_offsets, tables_blob); +build_tpm_tcpa (tables_blob, tables->linker, tables->tcpalog); + }else {/* TPM_VERSION_2_0 */ acpi_add_table (table_offsets, tables_blob);build_tpm2 (tables_blob, tables->linker, tables->tcpalog); }
Signature · 1 line
2.24.1
Quoted 7 lines · Stefan Berger
From: Stefan Berger <[email protected]>
Do not build a TCPA table for TPM 2 anymore but create the log area when building the TPM2 table. The TCPA table is only needed for TPM 1.2.
Signed-off-by Stefan Berger <[email protected]>
---
Quoted 40 lines
hw/i386/acpi-build.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)hw/i386/acpi-build.c +4
-0@@ -2317,6 +2317,10 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) tpm2_ptr->log_area_minimum_length =cpu_to_le32 (TPM_LOG_AREA_MINIMUM_SIZE ); +acpi_data_push (tcpalog,le32_to_cpu (tpm2_ptr->log_area_minimum_length)); +bios_linker_loader_alloc (linker,ACPI_BUILD_TPMLOG_FILE , tcpalog,1 , + false); +/* log area start address to be filled by Guest linker */ bios_linker_loader_add_pointer(linker,
ACPI_BUILD_TABLE_FILE,
log_addr_offset,log_addr_size,hw/i386/acpi-build.c +4
-4@@ -2848,10 +2852,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) build_hpet(tables_blob, tables->linker); }if (misc.tpm_version !=TPM_VERSION_UNSPEC ) { -acpi_add_table (table_offsets, tables_blob); -build_tpm_tcpa (tables_blob, tables->linker, tables->tcpalog); - -if (misc.tpm_version ==TPM_VERSION_2_0 ) { +if (misc.tpm_version ==TPM_VERSION_1_2 ) { +acpi_add_table (table_offsets, tables_blob); +build_tpm_tcpa (tables_blob, tables->linker, tables->tcpalog); + }else {/* TPM_VERSION_2_0 */ acpi_add_table (table_offsets, tables_blob);build_tpm2 (tables_blob, tables->linker, tables->tcpalog);}--
2.24.1
Signature · 1 line
Marc-André Lureau
Quoted 4 lines · Stefan Berger
From: Stefan Berger <[email protected]>
Do not build a TCPA table for TPM 2 anymore but create the log area when building the TPM2 table. The TCPA table is only needed for TPM 1.2.
Specs are here: https://trustedcomputinggroup.org/wp-content/uploads/TCG_ACPIGeneralSpecification_v1.20_r8.pdf
TCPA is a TPM 1.2 table and TPM2 tables is sufficient for TPM 2.0.
Auger Eric
Reviewed-byHi Stefan
Quoted 5 lines · Stefan Berger
Quoted 4 lines · Stefan Berger
From: Stefan Berger <[email protected]>
Do not build a TCPA table for TPM 2 anymore but create the log area when building the TPM2 table. The TCPA table is only needed for TPM 1.2.
Now I understand the purpose of the tcpalog arg in build_tpm2() ;-)
I will send shortly 2 series, the one related to ARM/ACPI support and a new one introducing ACPI table tests based on this new patch as both conflict with this patch.
Thanks
Eric
Quoted 10 lines
Specs are here:
https://trustedcomputinggroup.org/wp-content/uploads/TCG_ACPIGeneralSpecification_v1.20_r8.pdfTCPA is a TPM 1.2 table and TPM2 tables is sufficient for TPM 2.0.
Quoted 6 lines · On Fri, 29 May 2020 15:28:40 -0400 Stefan Berger <[email protected]>…
From: Stefan Berger <[email protected]>
Do not build a TCPA table for TPM 2 anymore but create the log area when building the TPM2 table. The TCPA table is only needed for TPM 1.2.
Signed-off-by Stefan Berger <[email protected]>
Quoted 34 lines
--- hw/i386/acpi-build.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)hw/i386/acpi-build.c +8
-4@@ -2317,6 +2317,10 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) tpm2_ptr->log_area_minimum_length =cpu_to_le32 (TPM_LOG_AREA_MINIMUM_SIZE ); +acpi_data_push (tcpalog,le32_to_cpu (tpm2_ptr->log_area_minimum_length)); +bios_linker_loader_alloc (linker,ACPI_BUILD_TPMLOG_FILE , tcpalog,1 , + false); +/* log area start address to be filled by Guest linker */ bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, log_addr_offset, log_addr_size,@@ -2848,10 +2852,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)build_hpet (tables_blob, tables->linker); }if (misc.tpm_version !=TPM_VERSION_UNSPEC ) { -acpi_add_table (table_offsets, tables_blob); -build_tpm_tcpa (tables_blob, tables->linker, tables->tcpalog); - -if (misc.tpm_version ==TPM_VERSION_2_0 ) { +if (misc.tpm_version ==TPM_VERSION_1_2 ) { +acpi_add_table (table_offsets, tables_blob); +build_tpm_tcpa (tables_blob, tables->linker, tables->tcpalog); + }else {/* TPM_VERSION_2_0 */ acpi_add_table (table_offsets, tables_blob);build_tpm2 (tables_blob, tables->linker, tables->tcpalog); }