[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 14/58] acpi: Convert build_tpm2() to build_append* API
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 14/58] acpi: Convert build_tpm2() to build_append* API |
Date: |
Fri, 12 Jun 2020 10:51:32 -0400 |
From: Eric Auger <eric.auger@redhat.com>
In preparation of its move to the generic acpi code,
let's convert build_tpm2() to use build_append API. This
latter now is prefered in place of direct ACPI struct field
settings with manual endianness conversion.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Message-Id: <20200601095737.32671-2-eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/acpi-build.c | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index d05d010f77..8d93a2d339 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2197,30 +2197,40 @@ build_tpm_tcpa(GArray *table_data, BIOSLinker *linker,
GArray *tcpalog)
static void
build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog)
{
- Acpi20TPM2 *tpm2_ptr = acpi_data_push(table_data, sizeof *tpm2_ptr);
+ Acpi20TPM2 *tpm2_ptr = acpi_data_push(table_data, sizeof(AcpiTableHeader));
unsigned log_addr_size = sizeof(tpm2_ptr->log_area_start_address);
unsigned log_addr_offset =
(char *)&tpm2_ptr->log_area_start_address - table_data->data;
+ uint8_t start_method_params[12] = {};
- tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT);
+ /* platform class */
+ build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2);
+ /* reserved */
+ build_append_int_noprefix(table_data, 0, 2);
if (TPM_IS_TIS_ISA(tpm_find())) {
- tpm2_ptr->control_area_address = cpu_to_le64(0);
- tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO);
+ /* address of control area */
+ build_append_int_noprefix(table_data, 0, 8);
+ /* start method */
+ build_append_int_noprefix(table_data, TPM2_START_METHOD_MMIO, 4);
} else if (TPM_IS_CRB(tpm_find())) {
- tpm2_ptr->control_area_address = cpu_to_le64(TPM_CRB_ADDR_CTRL);
- tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_CRB);
+ build_append_int_noprefix(table_data, TPM_CRB_ADDR_CTRL, 8);
+ build_append_int_noprefix(table_data, TPM2_START_METHOD_CRB, 4);
} else {
g_warn_if_reached();
}
- tpm2_ptr->log_area_minimum_length =
- cpu_to_le32(TPM_LOG_AREA_MINIMUM_SIZE);
+ /* platform specific parameters */
+ g_array_append_vals(table_data, &start_method_params, 12);
- acpi_data_push(tcpalog, le32_to_cpu(tpm2_ptr->log_area_minimum_length));
+ /* log area minimum length */
+ build_append_int_noprefix(table_data, TPM_LOG_AREA_MINIMUM_SIZE, 4);
+
+ acpi_data_push(tcpalog, TPM_LOG_AREA_MINIMUM_SIZE);
bios_linker_loader_alloc(linker, ACPI_BUILD_TPMLOG_FILE, tcpalog, 1,
false);
/* log area start address to be filled by Guest linker */
+ build_append_int_noprefix(table_data, 0, 8);
bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,
log_addr_offset, log_addr_size,
ACPI_BUILD_TPMLOG_FILE, 0);
--
MST
- [PULL v2 53/58] acpi: madt: skip pci override on pci-less systems., (continued)
- [PULL v2 53/58] acpi: madt: skip pci override on pci-less systems., Michael S. Tsirkin, 2020/06/12
- [PULL v2 54/58] acpi: fadt: add hw-reduced sleep register support, Michael S. Tsirkin, 2020/06/12
- [PULL v2 57/58] pci: Display PCI IRQ pin in "info pci", Michael S. Tsirkin, 2020/06/12
- [PULL v2 56/58] Fix parameter type in vhost migration log path, Michael S. Tsirkin, 2020/06/12
- [PULL v2 31/58] hw/pci/pci_bridge: Correct pci_bridge_io memory region size, Michael S. Tsirkin, 2020/06/12
- [PULL v2 05/58] qtest: allow DSDT acpi table changes, Michael S. Tsirkin, 2020/06/12
- [PULL v2 04/58] tests/acpi: update expected SRAT files, Michael S. Tsirkin, 2020/06/12
- [PULL v2 02/58] diffs-allowed: add the SRAT AML to diffs-allowed, Michael S. Tsirkin, 2020/06/12
- [PULL v2 18/58] tests/acpi: Add void tables for Q35/TPM-TIS bios-tables-test, Michael S. Tsirkin, 2020/06/12
- [PULL v2 25/58] virtio-balloon: Implement support for page poison reporting feature, Michael S. Tsirkin, 2020/06/12
- [PULL v2 14/58] acpi: Convert build_tpm2() to build_append* API,
Michael S. Tsirkin <=
- [PULL v2 32/58] hw/pci/pci_bridge: Use the IEC binary prefix definitions, Michael S. Tsirkin, 2020/06/12
- [PULL v2 17/58] test/tpm-emu: include sockets and channel headers in tpm-emu header, Michael S. Tsirkin, 2020/06/12
- [PULL v2 58/58] virtio-pci: fix queue_enable write, Michael S. Tsirkin, 2020/06/12
- [PULL v2 49/58] virtio: add vhost-user-vsock base device, Michael S. Tsirkin, 2020/06/12
- [PULL v2 30/58] hw/pci-host/prep: Correct RAVEN bus bridge memory region size, Michael S. Tsirkin, 2020/06/12
- [PULL v2 50/58] virtio: add vhost-user-vsock-pci device, Michael S. Tsirkin, 2020/06/12
- [PULL v2 48/58] vhost-vsock: add vhost-vsock-common abstraction, Michael S. Tsirkin, 2020/06/12
- Re: [PULL v2 00/58] virtio, acpi, pci: features, fixes, cleanups, tests, no-reply, 2020/06/12
- Re: [PULL v2 00/58] virtio, acpi, pci: features, fixes, cleanups, tests, Peter Maydell, 2020/06/12