github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-21 13:08:42 +00:00
Code Issues Projects Releases Wiki Activity

hv && config-tool: Rename GUEST_FLAG_TPM2_FIXUP

Browse Source 
This patch renames the GUEST_FLAG_TPM2_FIXUP to
GUEST_FLAG_SECURITY_VM.

v2 -> v3:
The "FIXUP" suffix is removed.

Tracked-On: #6320
Signed-off-by: Yifan Liu <yifan1.liu@intel.com>

Oops
This commit is contained in:
Yifan Liu 2021-08-19 16:06:18 +08:00 committed by wenlingz
parent 8b7d3ad492
commit f70b9788e9
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/include/public/acrn_common.h
View File

@ -56,7 +56,7 @@
#define GUEST_FLAG_HIDE_MTRR (1UL << 3U) /* Whether hide MTRR from VM */ #define GUEST_FLAG_HIDE_MTRR (1UL << 3U) /* Whether hide MTRR from VM */
#define GUEST_FLAG_RT (1UL << 4U) /* Whether the vm is RT-VM */ #define GUEST_FLAG_RT (1UL << 4U) /* Whether the vm is RT-VM */
#define GUEST_FLAG_NVMX_ENABLED (1UL << 5U) /* Whether this VM supports nested virtualization */ #define GUEST_FLAG_NVMX_ENABLED (1UL << 5U) /* Whether this VM supports nested virtualization */
#define GUEST_FLAG_TPM2_FIXUP (1UL << 6U) /* Whether this VM needs to do TPM2 fixup */ #define GUEST_FLAG_SECURITY_VM (1UL << 6U) /* Whether this VM needs to do security-vm related fixup (TPM2 and SMBIOS pt) */
/* TODO: We may need to get this addr from guest ACPI instead of hardcode here */ /* TODO: We may need to get this addr from guest ACPI instead of hardcode here */
#define VIRTUAL_SLEEP_CTL_ADDR 0x400U /* Pre-launched VM uses ACPI reduced HW mode and sleep control register */ #define VIRTUAL_SLEEP_CTL_ADDR 0x400U /* Pre-launched VM uses ACPI reduced HW mode and sleep control register */

2
hypervisor/quirks/security_vm_fixup.c
View File

@ -82,7 +82,7 @@ void security_vm_fixup(uint16_t vm_id)
{ {
struct acrn_vm_config *vm_config = get_vm_config(vm_id); struct acrn_vm_config *vm_config = get_vm_config(vm_id);
if ((vm_config->guest_flags & GUEST_FLAG_TPM2_FIXUP) != 0UL) { if ((vm_config->guest_flags & GUEST_FLAG_SECURITY_VM) != 0UL) {
stac(); stac();
tpm2_fixup(vm_id); tpm2_fixup(vm_id);
clac(); clac();

2
misc/config_tools/data/tgl-rvp/hybrid.xml
View File

@ -71,7 +71,7 @@
<vm_type>SAFETY_VM</vm_type> <vm_type>SAFETY_VM</vm_type>
<name>ACRN PRE-LAUNCHED VM0</name> <name>ACRN PRE-LAUNCHED VM0</name>
<guest_flags> <guest_flags>
<guest_flag>GUEST_FLAG_TPM2_FIXUP</guest_flag> <guest_flag>GUEST_FLAG_SECURITY_VM</guest_flag>
</guest_flags> </guest_flags>
<cpu_affinity> <cpu_affinity>
<pcpu_id>3</pcpu_id> <pcpu_id>3</pcpu_id>

2
misc/config_tools/library/common.py
View File

@ -23,7 +23,7 @@ DATACHECK_SCHEMA_FILE = SOURCE_ROOT_DIR + 'misc/config_tools/schema/datachecks.x
PY_CACHES = ["__pycache__", "../board_config/__pycache__", "../scenario_config/__pycache__"] PY_CACHES = ["__pycache__", "../board_config/__pycache__", "../scenario_config/__pycache__"]
GUEST_FLAG = ["0", "0UL", "GUEST_FLAG_SECURE_WORLD_ENABLED", "GUEST_FLAG_LAPIC_PASSTHROUGH", GUEST_FLAG = ["0", "0UL", "GUEST_FLAG_SECURE_WORLD_ENABLED", "GUEST_FLAG_LAPIC_PASSTHROUGH",
"GUEST_FLAG_IO_COMPLETION_POLLING", "GUEST_FLAG_NVMX_ENABLED", "GUEST_FLAG_HIDE_MTRR", "GUEST_FLAG_IO_COMPLETION_POLLING", "GUEST_FLAG_NVMX_ENABLED", "GUEST_FLAG_HIDE_MTRR",
"GUEST_FLAG_RT", "GUEST_FLAG_TPM2_FIXUP"] "GUEST_FLAG_RT", "GUEST_FLAG_SECURITY_VM"]
MULTI_ITEM = ["guest_flag", "pcpu_id", "vcpu_clos", "input", "block", "network", "pci_dev", "shm_region", "communication_vuart"] MULTI_ITEM = ["guest_flag", "pcpu_id", "vcpu_clos", "input", "block", "network", "pci_dev", "shm_region", "communication_vuart"]

5
misc/config_tools/schema/VMtypes.xsd
View File

@ -38,7 +38,8 @@
- ``GUEST_FLAG_HIDE_MTRR`` specify that MTRR is hidden from the VM - ``GUEST_FLAG_HIDE_MTRR`` specify that MTRR is hidden from the VM
- ``GUEST_FLAG_RT`` specify that the VM is an RT-VM (real-time) - ``GUEST_FLAG_RT`` specify that the VM is an RT-VM (real-time)
- ``GUEST_FLAG_NVMX_ENABLED`` specify that the VM supports nested virtualization - ``GUEST_FLAG_NVMX_ENABLED`` specify that the VM supports nested virtualization
- ``GUEST_FLAG_TPM2_FIXUP`` specify that the VM needs to do fixup for TPM2 passthrough</xs:documentation> - ``GUEST_FLAG_SECURITY_VM`` specify that the VM needs to do security-vm related
fixup (TPM2 passthrough and SMBIOS passthrough)</xs:documentation>
</xs:annotation> </xs:annotation>
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:enumeration value="" /> <xs:enumeration value="" />
@ -50,7 +51,7 @@
<xs:enumeration value="GUEST_FLAG_HIDE_MTRR" /> <xs:enumeration value="GUEST_FLAG_HIDE_MTRR" />
<xs:enumeration value="GUEST_FLAG_RT" /> <xs:enumeration value="GUEST_FLAG_RT" />
<xs:enumeration value="GUEST_FLAG_NVMX_ENABLED" /> <xs:enumeration value="GUEST_FLAG_NVMX_ENABLED" />
<xs:enumeration value="GUEST_FLAG_TPM2_FIXUP" /> <xs:enumeration value="GUEST_FLAG_SECURITY_VM" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>

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

@ -50,7 +50,7 @@
<xsl:when test="count(vm[vm_type='SOS_VM'])"> <xsl:when test="count(vm[vm_type='SOS_VM'])">
<xsl:value-of select="acrn:comment('Bitmask of guest flags that can be programmed by device model. Other bits are set by hypervisor only.')" /> <xsl:value-of select="acrn:comment('Bitmask of guest flags that can be programmed by device model. Other bits are set by hypervisor only.')" />
<xsl:value-of select="$newline" /> <xsl:value-of select="$newline" />
<xsl:value-of select="acrn:define('DM_OWNED_GUEST_FLAG_MASK', '(GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | GUEST_FLAG_RT | GUEST_FLAG_IO_COMPLETION_POLLING | GUEST_FLAG_TPM2_FIXUP)', '')" /> <xsl:value-of select="acrn:define('DM_OWNED_GUEST_FLAG_MASK', '(GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | GUEST_FLAG_RT | GUEST_FLAG_IO_COMPLETION_POLLING | GUEST_FLAG_SECURITY_VM)', '')" />
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="acrn:define('DM_OWNED_GUEST_FLAG_MASK', '0', 'UL')" /> <xsl:value-of select="acrn:define('DM_OWNED_GUEST_FLAG_MASK', '0', 'UL')" />