[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 06/35] acpi: build_tpm2: use acpi_table_begin()/acpi_table_end
From: |
Igor Mammedov |
Subject: |
[PATCH v4 06/35] acpi: build_tpm2: use acpi_table_begin()/acpi_table_end() instead of build_header() |
Date: |
Fri, 24 Sep 2021 08:27:33 -0400 |
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>
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
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 4d0ff6e5f3..23cda45ee0 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -2111,13 +2111,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_table_begin(&table, table_data);
/* Platform Class */
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,
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_end(linker, &table);
}
#endif
--
2.27.0
- [PATCH v4 00/35] acpi: refactor error prone build_header() and packed structures usage in ACPI tables, Igor Mammedov, 2021/09/24
- [PATCH v4 01/35] acpi: add helper routines to initialize ACPI tables, Igor Mammedov, 2021/09/24
- [PATCH v4 02/35] acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 03/35] acpi: build_xsdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 04/35] acpi: build_slit: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 06/35] acpi: build_tpm2: use acpi_table_begin()/acpi_table_end() instead of build_header(),
Igor Mammedov <=
- [PATCH v4 05/35] acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 07/35] acpi: acpi_build_hest: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 08/35] acpi: build_mcfg: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 09/35] acpi: build_hmat: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 10/35] acpi: nvdimm_build_nfit: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 11/35] acpi: nvdimm_build_ssdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 12/35] acpi: vmgenid_build_acpi: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 13/35] acpi: x86: build_dsdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 14/35] acpi: build_hpet: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24
- [PATCH v4 15/35] acpi: build_tpm_tcpa: use acpi_table_begin()/acpi_table_end() instead of build_header(), Igor Mammedov, 2021/09/24