| Message ID | 20210625091818.1047980-26-imammedo@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | acpi: refactor error prone build_header() and packed structures usage in ACPI tables | expand |
On 6/25/21 5:17 AM, Igor Mammedov wrote: > 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> I applied patch 19 of this series along with this one and this one works (TPM 1.2 not so much with TCPA modifications): Tested-by: Stefan Berger <stefanb@linux.ibm.com> > --- > CC: stefanb@linux.vnet.ibm.com > --- > hw/acpi/aml-build.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index 3da32301b6..159f998187 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -2098,13 +2098,14 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, > const char *oem_id, const char *oem_table_id) > { > uint8_t start_method_params[12] = {}; > - unsigned log_addr_offset, tpm2_start; > + unsigned log_addr_offset; > uint64_t control_area_start_address; > TPMIf *tpmif = tpm_find(); > 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_data_push(table_data, sizeof(AcpiTableHeader)); > + acpi_init_table(&table, table_data); > > /* Platform Class */ > build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2); > @@ -2142,9 +2143,7 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, > bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, > log_addr_offset, 8, > ACPI_BUILD_TPMLOG_FILE, 0); > - build_header(linker, table_data, > - (void *)(table_data->data + tpm2_start), > - "TPM2", table_data->len - tpm2_start, 4, oem_id, oem_table_id); > + acpi_table_composed(linker, &table); > } > #endif >
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 3da32301b6..159f998187 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -2098,13 +2098,14 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, const char *oem_id, const char *oem_table_id) { uint8_t start_method_params[12] = {}; - unsigned log_addr_offset, tpm2_start; + unsigned log_addr_offset; uint64_t control_area_start_address; TPMIf *tpmif = tpm_find(); 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_data_push(table_data, sizeof(AcpiTableHeader)); + acpi_init_table(&table, table_data); /* Platform Class */ build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2); @@ -2142,9 +2143,7 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, log_addr_offset, 8, ACPI_BUILD_TPMLOG_FILE, 0); - build_header(linker, table_data, - (void *)(table_data->data + tpm2_start), - "TPM2", table_data->len - tpm2_start, 4, oem_id, oem_table_id); + acpi_table_composed(linker, &table); } #endif
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> --- CC: stefanb@linux.vnet.ibm.com --- hw/acpi/aml-build.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)