github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-12 20:39:59 +00:00
Code Issues Projects Releases Wiki Activity

misc: modify vuart config for xmls

Browse Source 
We have redesign the vuart and the UI for user, so the config tool
should change the schema and xform for the new xml, then change the
static_allocators to alloc irq for new connection.

This patch modify the xmls for vuart new design.

Tracked-On: #6690
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
Signed-off-by: Chenli Wei <chenli.wei@linux.intel.com>
This commit is contained in:
Chenli Wei
2022-03-01 15:53:07 +08:00
committed by acrnsi-robot
parent 9450fcf3e1
commit 71129879d1
20 changed files with 290 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
misc/config_tools/data/generic_board/hybrid.xml
View File

@@ -51,6 +51,20 @@
<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">
<vm_type>STANDARD_VM</vm_type>
@@ -85,21 +99,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
@@ -138,21 +140,9 @@
<base>SERVICE_VM_COM1_BASE</base>
<irq>SERVICE_VM_COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>SERVICE_VM_COM2_BASE</base>
<irq>SERVICE_VM_COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
@@ -176,21 +166,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>INVALID_COM_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>0</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<PTM>n</PTM>
</vm>
<vm id="3">
@@ -212,21 +190,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>INVALID_COM_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>0</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>

62
misc/config_tools/data/generic_board/hybrid_rt.xml
View File

@@ -70,6 +70,20 @@
<GPU_SBDF>0x00000010</GPU_SBDF>
<UEFI_OS_LOADER_NAME/>
</MISC_CFG>
<vuart_connections>
<vuart_connection>
<name>vUART connection 1</name>
<type>legacy</type>
<endpoint>
<vm_name>PRE_RT_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">
<vm_type>RTVM</vm_type>
@@ -106,21 +120,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<pci_devs>
<pci_dev>00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20)</pci_dev>
<pci_dev>58:00.0 Ethernet controller: Intel Corporation Device 15f2 (rev 03)</pci_dev>
@@ -157,21 +159,9 @@
<base>SERVICE_VM_COM1_BASE</base>
<irq>SERVICE_VM_COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>SERVICE_VM_COM2_BASE</base>
<irq>SERVICE_VM_COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
@@ -197,21 +187,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>INVALID_COM_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>0</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<PTM>n</PTM>
</vm>
<vm id="3">
@@ -233,21 +211,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>INVALID_COM_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>0</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>

38
misc/config_tools/data/generic_board/partitioned.xml
View File

@@ -51,6 +51,20 @@
<MISC_CFG>
<GPU_SBDF>0x00000010</GPU_SBDF>
</MISC_CFG>
<vuart_connections>
<vuart_connection>
<name>vUART connection 1</name>
<type>legacy</type>
<endpoint>
<vm_name>PRE_STD_VM0</vm_name>
<io_port>0x2F8</io_port>
</endpoint>
<endpoint>
<vm_name>PRE_STD_VM1</vm_name>
<io_port>0x2F8</io_port>
</endpoint>
</vuart_connection>
</vuart_connections>
</hv>
<vm id="0">
<vm_type>STANDARD_VM</vm_type>
@@ -87,21 +101,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<pci_devs>
<pci_dev>00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20)</pci_dev>
<pci_dev>58:00.0 Ethernet controller: Intel Corporation Device 15f2 (rev 03)</pci_dev>
@@ -147,21 +149,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<pci_devs>
<pci_dev>00:14.0 USB controller: Intel Corporation Device a0ed (rev 20)</pci_dev>
<pci_dev/>

98
misc/config_tools/data/generic_board/shared.xml
View File

@@ -51,6 +51,20 @@
<MISC_CFG>
<GPU_SBDF>0x00000010</GPU_SBDF>
</MISC_CFG>
<vuart_connections>
<vuart_connection>
<name>vUART connection 1</name>
<type>legacy</type>
<endpoint>
<vm_name>ACRN_Service_VM</vm_name>
<io_port>0x2F8</io_port>
</endpoint>
<endpoint>
<vm_name>POST_RT_VM1</vm_name>
<io_port>0x2F8</io_port>
</endpoint>
</vuart_connection>
</vuart_connections>
</hv>
<vm id="0">
<vm_type>STANDARD_VM</vm_type>
@@ -76,21 +90,9 @@
<base>SERVICE_VM_COM1_BASE</base>
<irq>SERVICE_VM_COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>SERVICE_VM_COM2_BASE</base>
<irq>SERVICE_VM_COM2_IRQ</irq>
<target_vm_id>2</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
@@ -116,21 +118,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>INVALID_COM_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<PTM>n</PTM>
</vm>
<vm id="2">
@@ -155,21 +145,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<PTM>n</PTM>
</vm>
<vm id="3">
@@ -193,21 +171,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>INVALID_COM_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<PTM>n</PTM>
</vm>
<vm id="4">
@@ -231,21 +197,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>INVALID_COM_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<PTM>n</PTM>
</vm>
<vm id="5">
@@ -269,21 +223,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>INVALID_COM_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<PTM>n</PTM>
</vm>
<vm id="6">
@@ -307,21 +249,9 @@
<base>COM1_BASE</base>
<irq>COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>INVALID_COM_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
<communication_vuart id="1">
<base>INVALID_PCI_BASE</base>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</communication_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>