openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

acpi: Eliminate all TPM related code if CONFIG_TPM is not set 

Cc: M: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210614191335.1968807-4-stefanb@linux.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Stefan Berger 2021-06-15 16:21:19 +02:00
parent f50be48a7b
commit 295f7dcb60
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2044,6 +2044,7 @@ build_hdr:
"FACP", tbl->len - fadt_start, f->rev, oem_id, oem_table_id); "FACP", tbl->len - fadt_start, f->rev, oem_id, oem_table_id);
} }
#ifdef CONFIG_TPM
/* /*
* build_tpm2 - Build the TPM2 table as specified in * build_tpm2 - Build the TPM2 table as specified in
* table 7: TCG Hardware Interface Description Table Format for TPM 2.0 * table 7: TCG Hardware Interface Description Table Format for TPM 2.0
@ -2101,6 +2102,7 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog,
(void *)(table_data->data + tpm2_start), (void *)(table_data->data + tpm2_start),
"TPM2", table_data->len - tpm2_start, 4, oem_id, oem_table_id); "TPM2", table_data->len - tpm2_start, 4, oem_id, oem_table_id);
} }
#endif
Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_offset, Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_offset,
uint32_t mmio32_offset, uint64_t mmio64_offset, uint32_t mmio32_offset, uint64_t mmio64_offset,

4
include/hw/acpi/tpm.h
View File

@ -21,6 +21,8 @@
#include "hw/acpi/aml-build.h" #include "hw/acpi/aml-build.h"
#include "sysemu/tpm.h" #include "sysemu/tpm.h"
#ifdef CONFIG_TPM
#define TPM_TIS_ADDR_BASE 0xFED40000 #define TPM_TIS_ADDR_BASE 0xFED40000
#define TPM_TIS_ADDR_SIZE 0x5000 #define TPM_TIS_ADDR_SIZE 0x5000
@ -209,4 +211,6 @@ REG32(CRB_DATA_BUFFER, 0x80)
void tpm_build_ppi_acpi(TPMIf *tpm, Aml *dev); void tpm_build_ppi_acpi(TPMIf *tpm, Aml *dev);
#endif /* CONFIG_TPM */
#endif /* HW_ACPI_TPM_H */ #endif /* HW_ACPI_TPM_H */