From 8fcd868a50d0278f03f7c69ecc071eae1f64b815 Mon Sep 17 00:00:00 2001
From: Shuang Zheng <shuang.zheng@intel.com>
Date: Thu, 6 May 2021 15:45:16 +0000
Subject: [PATCH] config_tools: enable features for default config on tgl-rvp
 and ehl-crb-b

enable CDP_ENABLED for RT in scenarios, enable ivshmem for industry
scenario, disable vuart0 in launch settings, passthru SATA for RTVM,
set virtio-net and virtio-blk for post-launched WaaG and YaaGs.

Tracked-On: #5955
Signed-off-by: Shuang Zheng <shuang.zheng@intel.com>
Reviewed-by: Victor Sun <victor.sun@intel.com>
---
 .../config_tools/data/ehl-crb-b/hybrid_rt.xml |  2 +-
 .../data/ehl-crb-b/hybrid_rt_fusa.xml         |  2 +-
 .../ehl-crb-b/hybrid_rt_launch_1uos_waag.xml  |  2 +-
 misc/config_tools/data/ehl-crb-b/industry.xml |  6 ++--
 .../ehl-crb-b/industry_launch_1uos_waag.xml   |  2 +-
 .../data/ehl-crb-b/industry_launch_2uos.xml   |  4 +--
 .../data/ehl-crb-b/industry_launch_6uos.xml   | 20 ++++++-------
 .../data/ehl-crb-b/sdc_launch_1uos_zephyr.xml |  2 +-
 misc/config_tools/data/tgl-rvp/hybrid_rt.xml  |  2 +-
 .../tgl-rvp/hybrid_rt_launch_1uos_waag.xml    |  2 +-
 misc/config_tools/data/tgl-rvp/industry.xml   |  6 ++--
 .../tgl-rvp/industry_launch_1uos_waag.xml     |  2 +-
 .../data/tgl-rvp/industry_launch_2uos.xml     |  6 ++--
 .../data/tgl-rvp/industry_launch_6uos.xml     | 28 +++++++++----------
 .../data/tgl-rvp/sdc_launch_1uos_zephyr.xml   |  2 +-
 15 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
index ae56f1923..04506fba4 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
@@ -17,7 +17,7 @@
             <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
             <RDT>
                 <RDT_ENABLED>n</RDT_ENABLED>
-                <CDP_ENABLED>n</CDP_ENABLED>
+                <CDP_ENABLED>y</CDP_ENABLED>
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
index f211026d9..7fdc8e0ca 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
@@ -17,7 +17,7 @@
             <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
             <RDT>
                 <RDT_ENABLED>n</RDT_ENABLED>
-                <CDP_ENABLED>n</CDP_ENABLED>
+                <CDP_ENABLED>y</CDP_ENABLED>
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml
index aacd61e1d..d4e4f749d 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml
@@ -5,7 +5,7 @@
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
 	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
 	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
 	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
diff --git a/misc/config_tools/data/ehl-crb-b/industry.xml b/misc/config_tools/data/ehl-crb-b/industry.xml
index 5f326a2a3..040f94a77 100644
--- a/misc/config_tools/data/ehl-crb-b/industry.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry.xml
@@ -17,7 +17,7 @@
             <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
             <RDT>
                 <RDT_ENABLED>y</RDT_ENABLED>
-                <CDP_ENABLED>n</CDP_ENABLED>
+                <CDP_ENABLED>y</CDP_ENABLED>
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
                 <CLOS_MASK>0xfff</CLOS_MASK>
@@ -41,8 +41,8 @@
             <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
             <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
             <IVSHMEM>
-                <IVSHMEM_ENABLED>n</IVSHMEM_ENABLED>
-                <IVSHMEM_REGION/>
+                <IVSHMEM_ENABLED>y</IVSHMEM_ENABLED>
+                <IVSHMEM_REGION>hv:/shm_region_0, 2, 2:3</IVSHMEM_REGION>
             </IVSHMEM>
             <PSRAM>
                 <PSRAM_ENABLED>n</PSRAM_ENABLED>
diff --git a/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_waag.xml b/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_waag.xml
index a3fe2d330..e5416ff52 100644
--- a/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_waag.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry_launch_1uos_waag.xml
@@ -5,7 +5,7 @@
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
 	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
 	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
 	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
diff --git a/misc/config_tools/data/ehl-crb-b/industry_launch_2uos.xml b/misc/config_tools/data/ehl-crb-b/industry_launch_2uos.xml
index 4003fa816..51e20afb8 100644
--- a/misc/config_tools/data/ehl-crb-b/industry_launch_2uos.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry_launch_2uos.xml
@@ -5,7 +5,7 @@
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
 	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
 	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
 	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@@ -71,7 +71,7 @@
 		<bluetooth desc="vm bluetooth"></bluetooth>
 		<sd_card desc="vm sd card device"></sd_card>
 		<ethernet desc="vm ethernet device"></ethernet>
-		<sata desc="vm sata device"></sata>
+		<sata desc="vm sata device">00:17.0 SATA controller: Intel Corporation Device 4b63 (rev 10)</sata>
 		<nvme desc="vm nvme device"></nvme>
 	</passthrough_devices>
 
diff --git a/misc/config_tools/data/ehl-crb-b/industry_launch_6uos.xml b/misc/config_tools/data/ehl-crb-b/industry_launch_6uos.xml
index 4847bc392..8cf1be0f8 100644
--- a/misc/config_tools/data/ehl-crb-b/industry_launch_6uos.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry_launch_6uos.xml
@@ -5,7 +5,7 @@
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
 	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
 	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
 	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@@ -71,7 +71,7 @@
 		<bluetooth desc="vm bluetooth"></bluetooth>
 		<sd_card desc="vm sd card device"></sd_card>
 		<ethernet desc="vm ethernet device"></ethernet>
-		<sata desc="vm sata device"></sata>
+		<sata desc="vm sata device">00:17.0 SATA controller: Intel Corporation Device 4b63 (rev 10)</sata>
 		<nvme desc="vm nvme device"></nvme>
 	</passthrough_devices>
 
@@ -117,9 +117,9 @@
         </passthrough_devices>
         <virtio_devices>
             <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]" />
-            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX]." />
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG3</network>
             <input desc="virtio input device" />
-            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
         </virtio_devices>
     </uos>
     <uos id="4">
@@ -157,9 +157,9 @@
         </passthrough_devices>
         <virtio_devices>
             <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]" />
-            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX]." />
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG4</network>
             <input desc="virtio input device" />
-            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
         </virtio_devices>
     </uos>
     <uos id="5">
@@ -197,9 +197,9 @@
         </passthrough_devices>
         <virtio_devices>
             <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]" />
-            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX]." />
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG5</network>
             <input desc="virtio input device" />
-            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
         </virtio_devices>
     </uos>
     <uos id="6">
@@ -237,9 +237,9 @@
         </passthrough_devices>
         <virtio_devices>
             <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]" />
-            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX]." />
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG6</network>
             <input desc="virtio input device" />
-            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
         </virtio_devices>
     </uos>
 </acrn-config>
diff --git a/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_zephyr.xml b/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_zephyr.xml
index eb15bff06..d26114518 100644
--- a/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_zephyr.xml
+++ b/misc/config_tools/data/ehl-crb-b/sdc_launch_1uos_zephyr.xml
@@ -5,7 +5,7 @@
 	<mem_size desc="UOS memory size in MByte">128</mem_size>
 	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
 	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
 	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
 	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
diff --git a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
index 714725d90..74b7827e7 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
@@ -18,7 +18,7 @@
         <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
         <RDT>
             <RDT_ENABLED>n</RDT_ENABLED>
-            <CDP_ENABLED>n</CDP_ENABLED>
+            <CDP_ENABLED>y</CDP_ENABLED>
         </RDT>
         <HYPERV_ENABLED>y</HYPERV_ENABLED>
         <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
diff --git a/misc/config_tools/data/tgl-rvp/hybrid_rt_launch_1uos_waag.xml b/misc/config_tools/data/tgl-rvp/hybrid_rt_launch_1uos_waag.xml
index 77f252259..24f265070 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid_rt_launch_1uos_waag.xml
@@ -5,7 +5,7 @@
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
 	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
 	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
 	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
diff --git a/misc/config_tools/data/tgl-rvp/industry.xml b/misc/config_tools/data/tgl-rvp/industry.xml
index a938a8a8f..5707860ac 100644
--- a/misc/config_tools/data/tgl-rvp/industry.xml
+++ b/misc/config_tools/data/tgl-rvp/industry.xml
@@ -16,7 +16,7 @@
       <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
-        <CDP_ENABLED>n</CDP_ENABLED>
+        <CDP_ENABLED>y</CDP_ENABLED>
       </RDT>
       <HYPERV_ENABLED>y</HYPERV_ENABLED>
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
@@ -24,8 +24,8 @@
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
       <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
       <IVSHMEM>
-        <IVSHMEM_ENABLED>n</IVSHMEM_ENABLED>
-        <IVSHMEM_REGION></IVSHMEM_REGION>
+        <IVSHMEM_ENABLED>y</IVSHMEM_ENABLED>
+        <IVSHMEM_REGION>hv:/shm_region_0, 2, 2:3</IVSHMEM_REGION>
       </IVSHMEM>
       <PSRAM>
         <PSRAM_ENABLED>n</PSRAM_ENABLED>
diff --git a/misc/config_tools/data/tgl-rvp/industry_launch_1uos_waag.xml b/misc/config_tools/data/tgl-rvp/industry_launch_1uos_waag.xml
index 60bbeac4d..d0c64efcb 100644
--- a/misc/config_tools/data/tgl-rvp/industry_launch_1uos_waag.xml
+++ b/misc/config_tools/data/tgl-rvp/industry_launch_1uos_waag.xml
@@ -5,7 +5,7 @@
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
 	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
 	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
 	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
diff --git a/misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml b/misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml
index 6ab31fb04..5dbb708c2 100644
--- a/misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml
+++ b/misc/config_tools/data/tgl-rvp/industry_launch_2uos.xml
@@ -5,7 +5,7 @@
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
 	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
 	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
 	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@@ -71,8 +71,8 @@
 		<bluetooth desc="vm bluetooth"></bluetooth>
 		<sd_card desc="vm sd card device"></sd_card>
 		<ethernet desc="vm ethernet device"></ethernet>
-		<sata desc="vm sata device"></sata>
-		<nvme desc="vm nvme device">01:00.0 Non-Volatile memory controller: Intel Corporation SSD Pro 7600p/760p/E 6100p Series (rev 03)</nvme>
+		<sata desc="vm sata device">00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20)</sata>
+		<nvme desc="vm nvme device"></nvme>
 	</passthrough_devices>
 
 	<virtio_devices>
diff --git a/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml b/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml
index a864245da..2cc0fe159 100644
--- a/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml
+++ b/misc/config_tools/data/tgl-rvp/industry_launch_6uos.xml
@@ -5,7 +5,7 @@
 	<mem_size desc="UOS memory size in MByte">4096</mem_size>
 	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT.">gvtd</gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
 	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
 	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
 	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">
@@ -71,7 +71,7 @@
 		<bluetooth desc="vm bluetooth"></bluetooth>
 		<sd_card desc="vm sd card device"></sd_card>
 		<ethernet desc="vm ethernet device"></ethernet>
-		<sata desc="vm sata device"></sata>
+		<sata desc="vm sata device">00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20)</sata>
 		<nvme desc="vm nvme device"></nvme>
 	</passthrough_devices>
 
@@ -116,10 +116,10 @@
             <nvme desc="vm nvme device" />
         </passthrough_devices>
         <virtio_devices>
-            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]" />
-            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX]." />
+            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG3</network>
             <input desc="virtio input device" />
-            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
         </virtio_devices>
     </uos>
     <uos id="4">
@@ -156,10 +156,10 @@
             <nvme desc="vm nvme device" />
         </passthrough_devices>
         <virtio_devices>
-            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]" />
-            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX]." />
+            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG4</network>
             <input desc="virtio input device" />
-            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
         </virtio_devices>
     </uos>
     <uos id="5">
@@ -196,10 +196,10 @@
             <nvme desc="vm nvme device" />
         </passthrough_devices>
         <virtio_devices>
-            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]" />
-            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX]." />
+            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG5</network>
             <input desc="virtio input device" />
-            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
         </virtio_devices>
     </uos>
     <uos id="6">
@@ -236,10 +236,10 @@
             <nvme desc="vm nvme device" />
         </passthrough_devices>
         <virtio_devices>
-            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]" />
-            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX]." />
+            <console desc="virtio console device,input format: [@]stdio|tty|pty|sock:portname[=portpath][,[@]stdio|tty|pty:portname[=portpath]]">@stdio:stdio_port</console>
+            <network desc="virtio network devices setting. Input format: tap_name,[vhost],[mac=XX:XX:XX:XX:XX:XX].">YaaG6</network>
             <input desc="virtio input device" />
-            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img" />
+            <block desc="virtio block device setting. format: [blk partition:][img path] e.g.: /dev/sda3:./a/b.img">./YaaG.img</block>
         </virtio_devices>
     </uos>
 </acrn-config>
diff --git a/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_zephyr.xml b/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_zephyr.xml
index 5a8ac07d6..2856cfa9b 100644
--- a/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_zephyr.xml
+++ b/misc/config_tools/data/tgl-rvp/sdc_launch_1uos_zephyr.xml
@@ -5,7 +5,7 @@
 	<mem_size desc="UOS memory size in MByte">128</mem_size>
 	<gvt_args desc="GVT settings. Set it to gvtd for GVTd, otherwise is GVTg arguments. The recommendation arguments for GVTg is 64 448 8. Leave it blank to disable GVT."></gvt_args>
 	<vbootloader desc="virtual bootloader method" readonly="true">ovmf</vbootloader>
-	<vuart0 desc="vUART0 which emulated by device model">Enable</vuart0>
+	<vuart0 desc="vUART0 which emulated by device model">Disable</vuart0>
 	<poweroff_channel desc="the method of power off uos"></poweroff_channel>
 	<usb_xhci desc="USB xHCI mediator configuration. input format: bus#-port#[:bus#-port#: ...]. e.g.: 1-2:2-4"></usb_xhci>
 	<cpu_affinity desc="List of pCPU that this VM's vCPUs are pinned to.">