github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-24 18:27:18 +00:00
Code Issues Projects Releases Wiki Activity

acrn-config: enable TPM2 config on ehl-crb-b board

Browse Source 
enable TPM2 config on ehl-crb-b board and update TPM2 configs on
legacy boards.

Tracked-On: #5266

Signed-off-by: Shuang Zheng <shuang.zheng@intel.com>
Reviewed-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Shuang Zheng
2020-09-08 21:46:25 +08:00
committed by wenlingz
parent 85e6e5516d
commit feb0772a53
23 changed files with 69 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
misc/vm_configs/xmls/config-xmls/apl-mrb/hybrid.xml
View File

@@ -106,6 +106,9 @@
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">
<vm_type desc="Specify the VM type" readonly="true">SOS_VM</vm_type>

6
misc/vm_configs/xmls/config-xmls/apl-mrb/logical_partition.xml
View File

@@ -109,6 +109,9 @@
<pci_dev desc="pci device">00:12.0 SATA controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series SATA AHCI Controller (rev 0b)</pci_dev>
<pci_dev desc="pci device">02:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">
<vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
@@ -160,5 +163,8 @@
<pci_dev desc="pci device">00:15.0 USB controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series USB xHCI (rev 0b)</pci_dev>
<pci_dev desc="pci device">03:00.0 Ethernet controller: Marvell Technology Group Ltd. 88W8897 [AVASTAR] 802.11ac Wireless</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
</acrn-config>

6
misc/vm_configs/xmls/config-xmls/apl-up2-n3350/logical_partition.xml
View File

@@ -108,6 +108,9 @@
<pci_dev desc="pci device">00:12.0 SATA controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series SATA AHCI Controller (rev 0b)</pci_dev>
<pci_dev desc="pci device">02:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 0c)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">
<vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
@@ -157,5 +160,8 @@
<pci_dev desc="pci device">00:15.0 USB controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series USB xHCI (rev 0b)</pci_dev>
<pci_dev desc="pci device">03:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 0c)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
</acrn-config>

3
misc/vm_configs/xmls/config-xmls/apl-up2/hybrid.xml
View File

@@ -106,6 +106,9 @@
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">
<vm_type desc="Specify the VM type" readonly="true">SOS_VM</vm_type>

6
misc/vm_configs/xmls/config-xmls/apl-up2/logical_partition.xml
View File

@@ -110,6 +110,9 @@
<pci_dev desc="pci device">00:12.0 SATA controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series SATA AHCI Controller (rev 0b)</pci_dev>
<pci_dev desc="pci device">02:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 0c)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">
<vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
@@ -161,5 +164,8 @@
<pci_dev desc="pci device">00:15.0 USB controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series USB xHCI (rev 0b)</pci_dev>
<pci_dev desc="pci device">03:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 0c)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
</acrn-config>

6
misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt.xml
View File

@@ -40,8 +40,8 @@
<L1D_VMENTRY_ENABLED desc="Enable L1 cache flush before VM entry.">n</L1D_VMENTRY_ENABLED>
<MCE_ON_PSC_DISABLED desc="Force to disable software workaround for Machine Check Error on Page Size Change.">n</MCE_ON_PSC_DISABLED>
<IVSHMEM desc="IVSHMEM configuration">
<IVSHMEM_ENABLED desc="Enable Share Memory between VMs by IVSHMEM.">n</IVSHMEM_ENABLED>
<IVSHMEM_REGION desc="the name, size, colon separated IDs of communication VMs of share memory region, separated by comma like this: hv:/shm_region_0, 0x200000, 0:2"></IVSHMEM_REGION>
<IVSHMEM_ENABLED desc="Enable Share Memory between VMs by IVSHMEM.">y</IVSHMEM_ENABLED>
<IVSHMEM_REGION desc="the name, size, colon separated IDs of communication VMs of share memory region, separated by comma like this: hv:/shm_region_0, 0x200000, 0:2">hv:/shm_region_0, 0x200000, 0:2</IVSHMEM_REGION>
</IVSHMEM>
</FEATURES>
<MEMORY>
@@ -116,7 +116,7 @@
<pci_dev desc="pci device">00:1d.2 Ethernet controller: Intel Corporation Device 4bb0</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
<TPM2 desc="TPM2 device">y</TPM2>
</mmio_resources>
</vm>
<vm id="1">

1
misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt_fusa.xml
View File

@@ -115,6 +115,7 @@
<pci_dev desc="pci device">00:1a.3 Non-VGA unclassified device [0000]: Intel Corporation Device 4b4a</pci_dev>
</pci_devs>
<mmio_resources desc="MMIO resources.">
<TPM2 desc="TPM2 device">n</TPM2>
<p2sb>true</p2sb>
</mmio_resources>
<pt_intx desc="pt intx mapping.">

3
misc/vm_configs/xmls/config-xmls/generic/hybrid.xml
View File

@@ -104,6 +104,9 @@
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">
<vm_type desc="Specify the VM type" readonly="true">SOS_VM</vm_type>

7
misc/vm_configs/xmls/config-xmls/generic/hybrid_rt.xml
View File

@@ -26,8 +26,8 @@
<L1D_VMENTRY_ENABLED desc="Enable L1 cache flush before VM entry.">n</L1D_VMENTRY_ENABLED>
<MCE_ON_PSC_DISABLED desc="Force to disable software workaround for Machine Check Error on Page Size Change.">n</MCE_ON_PSC_DISABLED>
<IVSHMEM desc="IVSHMEM configuration">
<IVSHMEM_ENABLED desc="Enable Share Memory between VMs by IVSHMEM.">n</IVSHMEM_ENABLED>
<IVSHMEM_REGION desc="the name, size, colon separated IDs of communication VMs of share memory region, separated by comma like this: hv:/shm_region_0, 0x200000, 0:2"></IVSHMEM_REGION>
<IVSHMEM_ENABLED desc="Enable Share Memory between VMs by IVSHMEM.">y</IVSHMEM_ENABLED>
<IVSHMEM_REGION desc="the name, size, colon separated IDs of communication VMs of share memory region, separated by comma like this: hv:/shm_region_0, 0x200000, 0:2">hv:/shm_region_0, 0x200000, 0:2</IVSHMEM_REGION>
</IVSHMEM>
</FEATURES>
@@ -102,6 +102,9 @@
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">y</TPM2>
</mmio_resources>
</vm>
<vm id="1">
<vm_type desc="Specify the VM type" readonly="true">SOS_VM</vm_type>

6
misc/vm_configs/xmls/config-xmls/generic/logical_partition.xml
View File

@@ -109,6 +109,9 @@
<pci_dev desc="pci device"></pci_dev>
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">
<vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
@@ -161,5 +164,8 @@
<pci_dev desc="pci device"></pci_dev>
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
</acrn-config>

3
misc/vm_configs/xmls/config-xmls/nuc6cayh/hybrid.xml
View File

@@ -106,6 +106,9 @@
<pci_devs desc="pci devices list">
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">
<vm_type desc="Specify the VM type" readonly="true">SOS_VM</vm_type>

6
misc/vm_configs/xmls/config-xmls/nuc6cayh/logical_partition.xml
View File

@@ -110,6 +110,9 @@
<pci_dev desc="pci device">00:12.0 SATA controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series SATA AHCI Controller (rev 0b)</pci_dev>
<pci_dev desc="pci device">03:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 15)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">
<vm_type desc="Specify the VM type" readonly="true">PRE_STD_VM</vm_type>
@@ -161,5 +164,8 @@
<pci_dev desc="pci device">00:15.0 USB controller: Intel Corporation Celeron N3350/Pentium N4200/Atom E3900 Series USB xHCI (rev 0b)</pci_dev>
<pci_dev desc="pci device">02:00.0 Network controller: Intel Corporation Device 24fb (rev 10)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
</acrn-config>

2
misc/vm_configs/xmls/config-xmls/template/PRE_RT_VM.xml
View File

@@ -45,7 +45,7 @@
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
<TPM2 desc="TPM2 device">y</TPM2>
</mmio_resources>
</vm>
</acrn-config>

2
misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid.xml
View File

@@ -103,7 +103,7 @@
<pci_dev desc="pci device"></pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">y</TPM2>
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">

4
misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt.xml
View File

@@ -24,8 +24,8 @@
<L1D_VMENTRY_ENABLED desc="Enable L1 cache flush before VM entry.">n</L1D_VMENTRY_ENABLED>
<MCE_ON_PSC_DISABLED desc="Force to disable software workaround for Machine Check Error on Page Size Change.">n</MCE_ON_PSC_DISABLED>
<IVSHMEM desc="IVSHMEM configuration">
<IVSHMEM_ENABLED desc="Enable Share Memory between VMs by IVSHMEM.">n</IVSHMEM_ENABLED>
<IVSHMEM_REGION desc="the name, size, colon separated IDs of communication VMs of share memory region, separated by comma like this: hv:/shm_region_0, 0x200000, 0:2"></IVSHMEM_REGION>
<IVSHMEM_ENABLED desc="Enable Share Memory between VMs by IVSHMEM.">y</IVSHMEM_ENABLED>
<IVSHMEM_REGION desc="the name, size, colon separated IDs of communication VMs of share memory region, separated by comma like this: hv:/shm_region_0, 0x200000, 0:2">hv:/shm_region_0, 0x200000, 0:2</IVSHMEM_REGION>
</IVSHMEM>
</FEATURES>

5
misc/vm_configs/xmls/config-xmls/tgl-rvp/logical_partition.xml
View File

@@ -107,7 +107,7 @@
<pci_dev desc="pci device">00:1f.6 Ethernet controller: Intel Corporation Ethernet Connection (13) I219-V (rev 20)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">y</TPM2>
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
<vm id="1">
@@ -159,5 +159,8 @@
<pci_devs desc="pci devices list">
<pci_dev desc="pci device">00:14.0 USB controller: Intel Corporation Device a0ed (rev 20)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
</acrn-config>

2
misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt.xml
View File

@@ -104,7 +104,7 @@
<pci_dev desc="pci device">03:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
<TPM2 desc="TPM2 device">y</TPM2>
</mmio_resources>
</vm>
<vm id="1">

3
misc/vm_configs/xmls/config-xmls/whl-ipc-i5/logical_partition.xml
View File

@@ -160,5 +160,8 @@
<pci_dev desc="pci device">00:14.0 USB controller: Intel Corporation Device 9ded (rev 30)</pci_dev>
<pci_dev desc="pci device">04:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
</mmio_resources>
</vm>
</acrn-config>

6
misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt.xml
View File

@@ -24,8 +24,8 @@
<L1D_VMENTRY_ENABLED desc="Enable L1 cache flush before VM entry.">n</L1D_VMENTRY_ENABLED>
<MCE_ON_PSC_DISABLED desc="Force to disable software workaround for Machine Check Error on Page Size Change.">n</MCE_ON_PSC_DISABLED>
<IVSHMEM desc="IVSHMEM configuration">
<IVSHMEM_ENABLED desc="Enable Share Memory between VMs by IVSHMEM.">n</IVSHMEM_ENABLED>
<IVSHMEM_REGION desc="the name, size, colon separated IDs of communication VMs of share memory region, separated by comma like this: hv:/shm_region_0, 0x200000, 0:2"></IVSHMEM_REGION>
<IVSHMEM_ENABLED desc="Enable Share Memory between VMs by IVSHMEM.">y</IVSHMEM_ENABLED>
<IVSHMEM_REGION desc="the name, size, colon separated IDs of communication VMs of share memory region, separated by comma like this: hv:/shm_region_0, 0x200000, 0:2">hv:/shm_region_0, 0x200000, 0:2</IVSHMEM_REGION>
</IVSHMEM>
</FEATURES>
@@ -104,7 +104,7 @@
<pci_dev desc="pci device">03:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)</pci_dev>
</pci_devs>
<mmio_resources desc="mmio devices list to passthrough">
<TPM2 desc="TPM2 device">n</TPM2>
<TPM2 desc="TPM2 device">y</TPM2>
</mmio_resources>
</vm>
<vm id="1">