openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

acpi: build_tpm2: use acpi_table_begin()/acpi_table_end() instead of build_header() 

it replaces error-prone pointer arithmetic for build_header() API,
with 2 calls to start and finish table creation,
which hides offsets magic from API user.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Message-Id: <20210924122802.1455362-7-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2021-09-24 08:27:33 -04:00 committed by Michael S. Tsirkin
parent 4b56e1e4eb
commit 3e39c1ed7b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/acpi/aml-build.c
View File

@ -2111,13 +2111,14 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog,
const char *oem_id, const char *oem_table_id) const char *oem_id, const char *oem_table_id)
{ {
uint8_t start_method_params[12] = {}; uint8_t start_method_params[12] = {};
unsigned log_addr_offset, tpm2_start; unsigned log_addr_offset;
uint64_t control_area_start_address; uint64_t control_area_start_address;
TPMIf *tpmif = tpm_find(); TPMIf *tpmif = tpm_find();
uint32_t start_method; uint32_t start_method;
AcpiTable table = { .sig = "TPM2", .rev = 4,
.oem_id = oem_id, .oem_table_id = oem_table_id };
tpm2_start = table_data->len; acpi_table_begin(&table, table_data);
acpi_data_push(table_data, sizeof(AcpiTableHeader));
/* Platform Class */ /* Platform Class */
build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2); build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2);
@ -2155,9 +2156,7 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog,
bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,
log_addr_offset, 8, log_addr_offset, 8,
ACPI_BUILD_TPMLOG_FILE, 0); ACPI_BUILD_TPMLOG_FILE, 0);
build_header(linker, table_data, acpi_table_end(linker, &table);
(void *)(table_data->data + tpm2_start),
"TPM2", table_data->len - tpm2_start, 4, oem_id, oem_table_id);
} }
#endif #endif