From 7d7c5416159f768668b45b7befdbffbaf8a0e420 Mon Sep 17 00:00:00 2001
From: jackwhich <zhongzhenx.liu@intel.com>
Date: Fri, 24 Jun 2022 15:57:24 +0800
Subject: [PATCH] config-tools: Fix release_3.0 vecow hybrid not working
 properly

Fix release_3.0 tgl-vecow-spc-7100-Corei7 hybrid not working properly

Tracked-On: #7371
Signed-off-by: zhongzhenx.liu <zhongzhenx.liu@intel.com>
---
 .../data/tgl-vecow-spc-7100-Corei7/hybrid.xml | 102 +++++++++---------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
index 95991b7b7..55e48340f 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
@@ -1,12 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <acrn-config>
   <hv>
     <BUILD_TYPE>debug</BUILD_TYPE>
-    <DEBUG_OPTIONS>
-      <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
-      <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
-      <NPK_LOGLEVEL>5</NPK_LOGLEVEL>
-      <CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
-    </DEBUG_OPTIONS>
     <FEATURES>
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
@@ -24,8 +19,30 @@
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
       <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
-      <IVSHMEM/>
+      <KEEP_IRQ_DISABLED>n</KEEP_IRQ_DISABLED>
     </FEATURES>
+    <vuart_connections>
+      <vuart_connection>
+        <name>vUART connection 1</name>
+        <type>legacy</type>
+        <endpoint>
+          <vm_name>SAFETY_VM0</vm_name>
+          <io_port>0x2F8</io_port>
+          <vbdf>00:10.0</vbdf>
+        </endpoint>
+        <endpoint>
+          <vm_name>ACRN_Service_VM</vm_name>
+          <io_port>0x2F8</io_port>
+          <vbdf>00:10.0</vbdf>
+        </endpoint>
+      </vuart_connection>
+    </vuart_connections>
+    <DEBUG_OPTIONS>
+      <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
+      <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
+      <NPK_LOGLEVEL>5</NPK_LOGLEVEL>
+      <CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
+    </DEBUG_OPTIONS>
     <MEMORY>
       <STACK_SIZE>0x2000</STACK_SIZE>
     </MEMORY>
@@ -35,73 +52,60 @@
       <MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
       <MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
       <MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
-      <MAX_MSIX_TABLE_NUM/>
       <MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
+      <MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
     </CAPACITIES>
     <MISC_CFG>
       <GPU_SBDF>0x00000010</GPU_SBDF>
     </MISC_CFG>
-    <vuart_connections>
-      <vuart_connection>
-        <name>vUART connection 1</name>
-        <type>legacy</type>
-        <endpoint>
-          <vm_name>SAFETY_VM0</vm_name>
-          <io_port>0x2F8</io_port>
-        </endpoint>
-        <endpoint>
-          <vm_name>ACRN_Service_VM</vm_name>
-          <io_port>0x2F8</io_port>
-        </endpoint>
-      </vuart_connection>
-    </vuart_connections>
   </hv>
   <vm id="0">
-    <load_order>PRE_LAUNCHED_VM</load_order>
     <vm_type>STANDARD_VM</vm_type>
-    <name>SAFETY_VM0</name>
-    <cpu_affinity>
-      <pcpu>
-        <pcpu_id>3</pcpu_id>
-      </pcpu>
-    </cpu_affinity>
-    <epc_section>
-      <base>0</base>
-      <size>0</size>
-    </epc_section>
+    <console_vuart>COM Port 1</console_vuart>
     <memory>
+      <size>256</size>
       <hpa_region>
         <start_hpa>0x100000000</start_hpa>
         <size_hpa>512</size_hpa>
       </hpa_region>
     </memory>
+    <cpu_affinity>
+      <pcpu>
+        <pcpu_id>3</pcpu_id>
+        <real_time_vcpu>n</real_time_vcpu>
+      </pcpu>
+    </cpu_affinity>
     <os_config>
       <kern_type>KERNEL_ELF</kern_type>
       <kern_mod>Zephyr_ElfImage</kern_mod>
-      <ramdisk_mod/>
-      <bootargs/>
+      <bootargs>rw rootwait root=/dev/sda2 console=tty0 console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
     </os_config>
-    <console_vuart>COM Port 1</console_vuart>
     <mmio_resources>
       <TPM2>n</TPM2>
       <p2sb>n</p2sb>
     </mmio_resources>
-    <pt_intx> </pt_intx>
-    <pci_devs/>
+    <load_order>PRE_LAUNCHED_VM</load_order>
+    <name>SAFETY_VM0</name>
+    <epc_section>
+      <base>0</base>
+      <size>0</size>
+    </epc_section>
+    <priority>PRIO_LOW</priority>
+    <companion_vmid>65535</companion_vmid>
   </vm>
   <vm id="1">
     <load_order>SERVICE_VM</load_order>
-    <vm_type>STANDARD_VM</vm_type>
     <name>ACRN_Service_VM</name>
     <os_config>
       <kern_type>KERNEL_BZIMAGE</kern_type>
       <kern_mod>Linux_bzImage</kern_mod>
-      <ramdisk_mod/>
-      <bootargs>        root=/dev/nvme0n1p2 rw rootwait console=tty0 console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3
-        i915.nuclear_pageflip=1 swiotlb=131072
-      </bootargs>
+      <bootargs>root=/dev/nvme0n1p2 rw rootwait console=tty0 console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3
+        i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
     </os_config>
     <console_vuart>COM Port 1</console_vuart>
+    <vm_type>STANDARD_VM</vm_type>
+    <priority>PRIO_LOW</priority>
+    <companion_vmid>65535</companion_vmid>
   </vm>
   <vm id="2">
     <load_order>POST_LAUNCHED_VM</load_order>
@@ -110,6 +114,7 @@
     <cpu_affinity>
       <pcpu>
         <pcpu_id>2</pcpu_id>
+        <real_time_vcpu>n</real_time_vcpu>
       </pcpu>
     </cpu_affinity>
     <memory>
@@ -123,7 +128,6 @@
     <os_type>Windows OS</os_type>
     <vbootloader>y</vbootloader>
     <vuart0>n</vuart0>
-    <usb_xhci/>
     <virtio_devices>
       <console>
         <use_type>Virtio console</use_type>
@@ -132,9 +136,10 @@
       <network>
         <interface_name>WaaG</interface_name>
       </network>
-      <input/>
       <block>./win10-ltsc.img</block>
     </virtio_devices>
+    <priority>PRIO_LOW</priority>
+    <companion_vmid>65535</companion_vmid>
   </vm>
   <vm id="3">
     <load_order>POST_LAUNCHED_VM</load_order>
@@ -143,6 +148,7 @@
     <cpu_affinity>
       <pcpu>
         <pcpu_id>2</pcpu_id>
+        <real_time_vcpu>n</real_time_vcpu>
       </pcpu>
     </cpu_affinity>
     <memory>
@@ -153,7 +159,6 @@
     <os_type>Non-Windows OS</os_type>
     <vbootloader>y</vbootloader>
     <vuart0>n</vuart0>
-    <usb_xhci/>
     <virtio_devices>
       <console>
         <use_type>Virtio console</use_type>
@@ -162,8 +167,9 @@
       <network>
         <interface_name>YaaG</interface_name>
       </network>
-      <input/>
       <block>./YaaG.img</block>
     </virtio_devices>
+    <priority>PRIO_LOW</priority>
+    <companion_vmid>65535</companion_vmid>
   </vm>
-</acrn-config>
+</acrn-config>
\ No newline at end of file