[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/29] acpi: create separate file for TCPA log
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 10/29] acpi: create separate file for TCPA log |
Date: |
Mon, 3 Nov 2014 14:45:14 +0200 |
From: Stefan Berger <address@hidden>
Create the TCPA log in a separate file rather than allocating
ACPI table memory for it.
Signed-off-by: Stefan Berger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/acpi-build.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 00be4bb..6bd2749 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -249,6 +249,7 @@ static void acpi_get_pci_info(PcPciInfo *info)
#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"
#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
+#define ACPI_BUILD_TPMLOG_FILE "etc/tpm/log"
static void
build_header(GArray *linker, GArray *table_data,
@@ -1214,27 +1215,28 @@ build_hpet(GArray *table_data, GArray *linker)
}
static void
-build_tpm_tcpa(GArray *table_data, GArray *linker)
+build_tpm_tcpa(GArray *table_data, GArray *linker, GArray *tcpalog)
{
Acpi20Tcpa *tcpa = acpi_data_push(table_data, sizeof *tcpa);
- /* the log area will come right after the TCPA table */
- uint64_t log_area_start_address = acpi_data_len(table_data);
+ uint64_t log_area_start_address = acpi_data_len(tcpalog);
tcpa->platform_class = cpu_to_le16(TPM_TCPA_ACPI_CLASS_CLIENT);
tcpa->log_area_minimum_length = cpu_to_le32(TPM_LOG_AREA_MINIMUM_SIZE);
tcpa->log_area_start_address = cpu_to_le64(log_area_start_address);
+ bios_linker_loader_alloc(linker, ACPI_BUILD_TPMLOG_FILE, 1,
+ false /* high memory */);
+
/* log area start address to be filled by Guest linker */
bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,
- ACPI_BUILD_TABLE_FILE,
+ ACPI_BUILD_TPMLOG_FILE,
table_data, &tcpa->log_area_start_address,
sizeof(tcpa->log_area_start_address));
build_header(linker, table_data,
(void *)tcpa, "TCPA", sizeof(*tcpa), 2);
- /* now only get the log area and with that modify table_data */
- acpi_data_push(table_data, TPM_LOG_AREA_MINIMUM_SIZE);
+ acpi_data_push(tcpalog, TPM_LOG_AREA_MINIMUM_SIZE);
}
static void
@@ -1485,6 +1487,7 @@ typedef
struct AcpiBuildTables {
GArray *table_data;
GArray *rsdp;
+ GArray *tcpalog;
GArray *linker;
} AcpiBuildTables;
@@ -1492,6 +1495,7 @@ static inline void acpi_build_tables_init(AcpiBuildTables
*tables)
{
tables->rsdp = g_array_new(false, true /* clear */, 1);
tables->table_data = g_array_new(false, true /* clear */, 1);
+ tables->tcpalog = g_array_new(false, true /* clear */, 1);
tables->linker = bios_linker_loader_init();
}
@@ -1503,6 +1507,7 @@ static inline void
acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre)
}
g_array_free(tables->rsdp, mfre);
g_array_free(tables->table_data, mfre);
+ g_array_free(tables->tcpalog, mfre);
}
typedef
@@ -1612,7 +1617,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables
*tables)
}
if (misc.has_tpm) {
acpi_add_table(table_offsets, tables->table_data);
- build_tpm_tcpa(tables->table_data, tables->linker);
+ build_tpm_tcpa(tables->table_data, tables->linker, tables->tcpalog);
acpi_add_table(table_offsets, tables->table_data);
build_tpm_ssdt(tables->table_data, tables->linker);
@@ -1778,6 +1783,9 @@ void acpi_setup(PcGuestInfo *guest_info)
acpi_add_rom_blob(NULL, tables.linker, "etc/table-loader");
+ fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_TPMLOG_FILE,
+ tables.tcpalog->data, acpi_data_len(tables.tcpalog));
+
/*
* RSDP is small so it's easy to keep it immutable, no need to
* bother with ROM blobs.
--
MST
- [Qemu-devel] [PULL 00/29] pc, virtio, misc bugfixes, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 01/29] smbios: Fix assertion on socket count calculation, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 02/29] well-defined listing order for machine types, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 03/29] i386/pc: add piix and q35 machtypes to sorting families for -M \?, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 04/29] pc: Fix disabling of vapic for compat PC models, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 05/29] i386: Add an ACPI_EXTRACT_NAME_BUFFER16 directive., Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 06/29] pcie: change confused comment clearer, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 08/29] intel_iommu: fix VTD_SID_TO_BUS, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 07/29] virtio-pci: fix migration for pci bus master, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 09/29] tests: fix rebuild-expected-aml.sh for acpi-test rename, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 10/29] acpi: create separate file for TCPA log,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 12/29] acpi:ich9: convert cpu hotplug to hotplug_handler API, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 11/29] acpi/cpu: add cpu hotplug callback function to match hotplug_handler API, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 13/29] acpi:piix4: convert cpu hotplug to hotplug_handler API, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 14/29] pc: add cpu hotplug handler to PC_MACHINE, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 15/29] pc: Update rtc_cmos in pc_cpu_plug, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 16/29] qom/cpu: remove the unused CPU hot-plug notifier, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 17/29] cpu-hotplug: rename function for better readability, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 18/29] acpi/cpu-hotplug: introduce helper function to keep bit setting in one place, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 19/29] -machine vmport=off: Allow disabling of VMWare ioport emulation, Michael S. Tsirkin, 2014/11/03
- [Qemu-devel] [PULL 20/29] hw/pci: fixed error flow in pci_qdev_init, Michael S. Tsirkin, 2014/11/03