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

Revert "misc: config_tools: add vuart for communication"

Browse Source 
This reverts commit 9e2edd5192.
Because config UI don't support multi legacy vuart in current logic,
we need to revert the commit to unblock UI.

Tracked-On: #6652
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
This commit is contained in:
Kunhui-Li
2021-11-03 17:31:16 +08:00
committed by wenlingz
parent c782795af8
commit 2f5db5f4ee
12 changed files with 86 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,11 +96,11 @@
<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>
<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>
@@ -150,25 +150,11 @@
<irq>SERVICE_VM_COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>2</target_vm_id>
<target_uart_id>2</target_uart_id>
</legacy_vuart>
<legacy_vuart id="3">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>3</target_vm_id>
<target_uart_id>2</target_uart_id>
<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>
@@ -184,7 +170,7 @@
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs> rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072 8250.nr_uarts=20
i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</board_private>
</vm>
@@ -215,13 +201,6 @@
<target_vm_id>0</target_vm_id>
<target_uart_id>0</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>1</target_vm_id>
<target_uart_id>2</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
@@ -259,13 +238,6 @@
<target_vm_id>0</target_vm_id>
<target_uart_id>0</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>1</target_vm_id>
<target_uart_id>3</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>

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

@@ -104,11 +104,11 @@
<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>
<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>
@@ -156,25 +156,11 @@
<irq>SERVICE_VM_COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>2</target_vm_id>
<target_uart_id>2</target_uart_id>
</legacy_vuart>
<legacy_vuart id="3">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>3</target_vm_id>
<target_uart_id>2</target_uart_id>
<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>
@@ -191,7 +177,7 @@
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs>
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072 8250.nr_uarts=20
i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</board_private>
</vm>
@@ -225,13 +211,6 @@
<target_vm_id>0</target_vm_id>
<target_uart_id>0</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>1</target_vm_id>
<target_uart_id>2</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
@@ -270,13 +249,6 @@
<target_vm_id>0</target_vm_id>
<target_uart_id>0</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>1</target_vm_id>
<target_uart_id>3</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>

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

@@ -86,53 +86,11 @@
<irq>SERVICE_VM_COM1_IRQ</irq>
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>1</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>2</target_vm_id>
<target_uart_id>2</target_uart_id>
</legacy_vuart>
<legacy_vuart id="3">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>3</target_vm_id>
<target_uart_id>2</target_uart_id>
</legacy_vuart>
<legacy_vuart id="4">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>4</target_vm_id>
<target_uart_id>2</target_uart_id>
</legacy_vuart>
<legacy_vuart id="5">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>5</target_vm_id>
<target_uart_id>2</target_uart_id>
</legacy_vuart>
<legacy_vuart id="6">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>6</target_vm_id>
<target_uart_id>2</target_uart_id>
</legacy_vuart>
<legacy_vuart id="7">
<type>VUART_LEGACY_PIO</type>
<base>CONFIG_COM_BASE</base>
<irq>0</irq>
<target_vm_id>7</target_vm_id>
<target_uart_id>2</target_uart_id>
<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>
@@ -148,7 +106,7 @@
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs> rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072 8250.nr_uarts=20
i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</board_private>
</vm>
@@ -175,11 +133,11 @@
<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>
<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>
@@ -216,18 +174,11 @@
</legacy_vuart>
<legacy_vuart id="1">
<type>VUART_LEGACY_PIO</type>
<base>INVALID_COM_BASE</base>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>2</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
@@ -267,13 +218,6 @@
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>3</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
@@ -313,13 +257,6 @@
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>4</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
@@ -359,13 +296,6 @@
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>5</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
@@ -405,13 +335,6 @@
<target_vm_id>0</target_vm_id>
<target_uart_id>1</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>6</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>
@@ -448,13 +371,6 @@
<target_vm_id>0</target_vm_id>
<target_uart_id>0</target_uart_id>
</legacy_vuart>
<legacy_vuart id="2">
<type>VUART_LEGACY_PIO</type>
<base>COM2_BASE</base>
<irq>COM2_IRQ</irq>
<target_vm_id>0</target_vm_id>
<target_uart_id>7</target_uart_id>
</legacy_vuart>
<console_vuart id="0">
<base>INVALID_PCI_BASE</base>
</console_vuart>