From 5ea9c551456201c183b83b9ac6bc0a93aea0c578 Mon Sep 17 00:00:00 2001 From: Shuang Zheng Date: Fri, 13 Nov 2020 18:19:18 +0800 Subject: [PATCH] acrn-config: enable tpm for hybird_rt on ehl enable tpm for hybrid_rt scenario on ehl board. Tracked-On: #5506 Signed-off-by: Shuang Zheng --- misc/acrn-config/board_config/misc_cfg_h.py | 14 ++++++++------ misc/acrn-config/library/board_cfg_lib.py | 2 +- misc/acrn-config/target/acpi.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/misc/acrn-config/board_config/misc_cfg_h.py b/misc/acrn-config/board_config/misc_cfg_h.py index 6c87d4f60..5e5456f30 100644 --- a/misc/acrn-config/board_config/misc_cfg_h.py +++ b/misc/acrn-config/board_config/misc_cfg_h.py @@ -374,12 +374,14 @@ def generate_file(config): vm0_pre_launch = True if vm0_pre_launch and board_cfg_lib.is_tpm_passthru(): - print("#define VM0_PASSTHROUGH_TPM", file=config) - print("#define VM0_TPM_BUFFER_BASE_ADDR 0xFED40000UL", file=config) - gpa = common.hpa2gpa(0, 0xFED40000, 0x5000) - print("#define VM0_TPM_BUFFER_BASE_ADDR_GPA 0x{:X}UL".format(gpa), file=config) - print("#define VM0_TPM_BUFFER_SIZE 0x5000UL", file=config) - print("", file=config) + tpm2_passthru_enabled = common.get_leaf_tag_map_bool(common.SCENARIO_INFO_FILE, "mmio_resources", "TPM2") + if 0 in tpm2_passthru_enabled and tpm2_passthru_enabled[0]: + print("#define VM0_PASSTHROUGH_TPM", file=config) + print("#define VM0_TPM_BUFFER_BASE_ADDR 0xFED40000UL", file=config) + gpa = common.hpa2gpa(0, 0xFED40000, 0x5000) + print("#define VM0_TPM_BUFFER_BASE_ADDR_GPA 0x{:X}UL".format(gpa), file=config) + print("#define VM0_TPM_BUFFER_SIZE 0x5000UL", file=config) + print("", file=config) pci_dev_num_per_vm_gen(config) diff --git a/misc/acrn-config/library/board_cfg_lib.py b/misc/acrn-config/library/board_cfg_lib.py index 405755bdb..10a3bca20 100644 --- a/misc/acrn-config/library/board_cfg_lib.py +++ b/misc/acrn-config/library/board_cfg_lib.py @@ -34,7 +34,7 @@ KNOWN_HIDDEN_PDEVS_BOARD_DB = { TSN_DEVS = ["8086:4b30", "8086:4b31", "8086:4b32", "8086:4ba0", "8086:4ba1", "8086:4ba2", "8086:4bb0", "8086:4bb1", "8086:4bb2", "8086:a0ac", "8086:43ac", "8086:43a2"] GPIO_DEVS = ["8086:4b88", "8086:4b89"] -TPM_PASSTHRU_BOARD = ['whl-ipc-i5', 'whl-ipc-i7', 'tgl-rvp'] +TPM_PASSTHRU_BOARD = ['whl-ipc-i5', 'whl-ipc-i7', 'tgl-rvp', 'ehl-crb-b'] KNOWN_CAPS_PCI_DEVS_DB = { "VMSIX":TSN_DEVS + GPIO_DEVS, diff --git a/misc/acrn-config/target/acpi.py b/misc/acrn-config/target/acpi.py index d54444027..1b5486361 100644 --- a/misc/acrn-config/target/acpi.py +++ b/misc/acrn-config/target/acpi.py @@ -598,7 +598,7 @@ def read_tpm_data(config): :return: ''' try: - acpi_table_output = subprocess.check_output(['ls -l /sys/firmware/acpi/tables/']).decode('utf8') + acpi_table_output = subprocess.check_output('ls -l /sys/firmware/acpi/tables/'.split()).decode('utf8') except: acpi_table_output = '' if 'TPM2' in acpi_table_output: