dfaggioli/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm/acpi: TPM2 ACPI table support

Browse Source 
Add a TPM2 ACPI table if a TPM2.0 sysbus device has been
dynamically instantiated.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

Message-Id: <20200601095737.32671-4-eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eric Auger
2020-06-01 11:57:36 +02:00
committed by Michael S. Tsirkin
parent 4338416064
commit 80bde69353
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1885,17 +1885,18 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog)
unsigned log_addr_offset = unsigned log_addr_offset =
(char *)&tpm2_ptr->log_area_start_address - table_data->data; (char *)&tpm2_ptr->log_area_start_address - table_data->data;
uint8_t start_method_params[12] = {}; uint8_t start_method_params[12] = {};
TPMIf *tpmif = tpm_find();
/* 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);
/* reserved */ /* reserved */
build_append_int_noprefix(table_data, 0, 2); build_append_int_noprefix(table_data, 0, 2);
if (TPM_IS_TIS_ISA(tpm_find())) { if (TPM_IS_TIS_ISA(tpmif) || TPM_IS_TIS_SYSBUS(tpmif)) {
/* address of control area */ /* address of control area */
build_append_int_noprefix(table_data, 0, 8); build_append_int_noprefix(table_data, 0, 8);
/* start method */ /* start method */
build_append_int_noprefix(table_data, TPM2_START_METHOD_MMIO, 4); build_append_int_noprefix(table_data, TPM2_START_METHOD_MMIO, 4);
} else if (TPM_IS_CRB(tpm_find())) { } else if (TPM_IS_CRB(tpmif)) {
build_append_int_noprefix(table_data, TPM_CRB_ADDR_CTRL, 8); build_append_int_noprefix(table_data, TPM_CRB_ADDR_CTRL, 8);
build_append_int_noprefix(table_data, TPM2_START_METHOD_CRB, 4); build_append_int_noprefix(table_data, TPM2_START_METHOD_CRB, 4);
} else { } else {

7
hw/arm/virt-acpi-build.c
View File

@@ -41,12 +41,14 @@
#include "hw/acpi/pci.h" #include "hw/acpi/pci.h"
#include "hw/acpi/memory_hotplug.h" #include "hw/acpi/memory_hotplug.h"
#include "hw/acpi/generic_event_device.h" #include "hw/acpi/generic_event_device.h"
#include "hw/acpi/tpm.h"
#include "hw/pci/pcie_host.h" #include "hw/pci/pcie_host.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/arm/virt.h" #include "hw/arm/virt.h"
#include "hw/mem/nvdimm.h" #include "hw/mem/nvdimm.h"
#include "sysemu/numa.h" #include "sysemu/numa.h"
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "sysemu/tpm.h"
#include "kvm_arm.h" #include "kvm_arm.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "hw/acpi/ghes.h" #include "hw/acpi/ghes.h"
@@ -848,6 +850,11 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
build_iort(tables_blob, tables->linker, vms); build_iort(tables_blob, tables->linker, vms);
} }
if (tpm_get_version(tpm_find()) == TPM_VERSION_2_0) {
acpi_add_table(table_offsets, tables_blob);
build_tpm2(tables_blob, tables->linker, tables->tcpalog);
}
/* XSDT is pointed to by RSDP */ /* XSDT is pointed to by RSDP */
xsdt = tables_blob->len; xsdt = tables_blob->len;
build_xsdt(tables_blob, tables->linker, table_offsets, NULL, NULL); build_xsdt(tables_blob, tables->linker, table_offsets, NULL, NULL);

2
include/sysemu/tpm.h
View File

@@ -50,6 +50,8 @@ typedef struct TPMIfClass {
#define TPM_IS_TIS_ISA(chr) \ #define TPM_IS_TIS_ISA(chr) \
object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA) object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA)
#define TPM_IS_TIS_SYSBUS(chr) \
object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_SYSBUS)
#define TPM_IS_CRB(chr) \ #define TPM_IS_CRB(chr) \
object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB) object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB)
#define TPM_IS_SPAPR(chr) \ #define TPM_IS_SPAPR(chr) \