OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

config_tools: Fix TPM2 parameter issue 

When enable TPM2 tag in acrn scenario file, can't pass compile:
File "../hypervisor/../misc/config_tools/acpi_gen/bin_gen.py", line 128, in tpm2_acpi_gen
    ctype_data.start_method_specific_parameters[i] = int(start_method_parameters[i], 16)
ValueError: invalid literal for int() with base 16: '\n        '

Fix this issue in tpm2_acpi_gen.

Tracked-On: #8516

Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Victor Sun <victor.sun@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Zhang Chen 2023-09-19 13:15:43 +08:00 committed by acrnsi-robot
parent bbe8e254cf
commit 930e5904af
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/config_tools/acpi_gen/bin_gen.py
View File

@ -123,7 +123,7 @@ def tpm2_acpi_gen(acpi_bin, board_etree, scenario_etree, allocation_etree):
ctype_data.header.creatorrevision = 0x20190703 ctype_data.header.creatorrevision = 0x20190703
ctype_data.address_of_control_area = 0xFED40040 ctype_data.address_of_control_area = 0xFED40040
ctype_data.start_method = int(get_node("//capability[@id = 'start_method']/value/text()", tpm2_node), 16) ctype_data.start_method = int(get_node("//capability[@id = 'start_method']/value/text()", tpm2_node), 16)
start_method_parameters = tpm2_node.xpath("//parameter/text()") start_method_parameters = tpm2_node.xpath("//capability[@id = 'start_method']/parameter/text()")
for i in range(len(start_method_parameters)): for i in range(len(start_method_parameters)):
ctype_data.start_method_specific_parameters[i] = int(start_method_parameters[i], 16) ctype_data.start_method_specific_parameters[i] = int(start_method_parameters[i], 16)
if get_node("//capability[@id = 'log_area']", board_etree) is not None: if get_node("//capability[@id = 'log_area']", board_etree) is not None: