github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 04:33:55 +00:00
Code Issues Projects Releases Wiki Activity

config-tools: add native log area address

Browse Source 
Extract the log area address from TPM2 acpi table and add node
log_area_start_address to board.xml. This emelment is used by host_pa of
mmiodevs.

Tracked-On: #6320
Signed-off-by: Yang,Yu-chu <yu-chu.yang@intel.com>
This commit is contained in:
Yang,Yu-chu 2021-08-11 19:27:45 -07:00 committed by wenlingz
parent d92c4bd840
commit a4be0aa57b
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/config_tools/board_inspector/extractors/50-acpi.py
View File

@ -126,7 +126,9 @@ def parse_tpm(elem):
for parameter in tpm2.start_method_specific_parameters: for parameter in tpm2.start_method_specific_parameters:
add_child(start_method, "parameter", hex(parameter)) add_child(start_method, "parameter", hex(parameter))
if hasattr(tpm2, "log_area_minimum_length"): if hasattr(tpm2, "log_area_minimum_length"):
add_child(elem, "capability", None, id="log_area") log_area = add_child(elem, "capability", None, id="log_area")
add_child(log_area, "log_area_minimum_length", hex(tpm2.log_area_minimum_length))
add_child(log_area, "log_area_start_address", hex(tpm2.log_area_start_address))
except Exception as e: except Exception as e:
logging.info(f"Parse ACPI TPM2 failed: {str(e)}") logging.info(f"Parse ACPI TPM2 failed: {str(e)}")
logging.info(f"Will not extract information from ACPI TPM2") logging.info(f"Will not extract information from ACPI TPM2")

1
misc/config_tools/xforms/misc_cfg.h.xsl
View File

@ -192,6 +192,7 @@
<xsl:value-of select="acrn:define('VM0_TPM_BUFFER_SIZE', '0x5000', 'UL')" /> <xsl:value-of select="acrn:define('VM0_TPM_BUFFER_SIZE', '0x5000', 'UL')" />
<xsl:if test="//capability[@id='log_area']"> <xsl:if test="//capability[@id='log_area']">
<xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_BASE_ADDR', //allocation-data/acrn-config/vm[@id = '0']/log_area_start_address, 'UL')" /> <xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_BASE_ADDR', //allocation-data/acrn-config/vm[@id = '0']/log_area_start_address, 'UL')" />
<xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_BASE_ADDR_HPA', //capability[@id='log_area']/log_area_start_address, 'UL')" />
<xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_SIZE', //allocation-data/acrn-config/vm[@id = '0']/log_area_minimum_length, 'UL')" /> <xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_SIZE', //allocation-data/acrn-config/vm[@id = '0']/log_area_minimum_length, 'UL')" />
</xsl:if> </xsl:if>
</xsl:if> </xsl:if>

2
misc/config_tools/xforms/vm_configurations.c.xsl
View File

@ -252,7 +252,7 @@
<xsl:if test="//capability[@id='log_area']"> <xsl:if test="//capability[@id='log_area']">
<xsl:value-of select="acrn:initializer('res[1]', '{', true())" /> <xsl:value-of select="acrn:initializer('res[1]', '{', true())" />
<xsl:value-of select="acrn:initializer('user_vm_pa', 'VM0_TPM_EVENTLOG_BASE_ADDR')" /> <xsl:value-of select="acrn:initializer('user_vm_pa', 'VM0_TPM_EVENTLOG_BASE_ADDR')" />
<xsl:value-of select="acrn:initializer('host_pa', 'VM0_TPM_EVENTLOG_BASE_ADDR')" /> <xsl:value-of select="acrn:initializer('host_pa', 'VM0_TPM_EVENTLOG_BASE_ADDR_HPA')" />
<xsl:value-of select="acrn:initializer('size', 'VM0_TPM_EVENTLOG_SIZE')" /> <xsl:value-of select="acrn:initializer('size', 'VM0_TPM_EVENTLOG_SIZE')" />
<xsl:value-of select="acrn:initializer('mem_type', 'EPT_WB')" /> <xsl:value-of select="acrn:initializer('mem_type', 'EPT_WB')" />
<xsl:text>},</xsl:text> <xsl:text>},</xsl:text>