From 71129879d1aab6555ea11f58bd6299e572972fd4 Mon Sep 17 00:00:00 2001 From: Chenli Wei Date: Tue, 1 Mar 2022 15:53:07 +0800 Subject: [PATCH] misc: modify vuart config for xmls 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 Signed-off-by: Chenli Wei --- misc/config_tools/data/cfl-k700-i7/hybrid.xml | 65 +++-------- .../data/cfl-k700-i7/hybrid_rt.xml | 62 +++------- .../data/cfl-k700-i7/partitioned.xml | 38 +++--- misc/config_tools/data/cfl-k700-i7/shared.xml | 98 +++------------- .../data/generic_board/hybrid.xml | 62 +++------- .../data/generic_board/hybrid_rt.xml | 62 +++------- .../data/generic_board/partitioned.xml | 38 +++--- .../data/generic_board/shared.xml | 98 +++------------- misc/config_tools/data/nuc11tnbi5/hybrid.xml | 62 +++------- .../data/nuc11tnbi5/partitioned.xml | 38 +++--- misc/config_tools/data/nuc11tnbi5/shared.xml | 110 +++++------------- misc/config_tools/data/qemu/shared.xml | 38 +++--- .../data/tgl-vecow-spc-7100-Corei7/hybrid.xml | 62 +++------- .../tgl-vecow-spc-7100-Corei7/partitioned.xml | 38 +++--- .../data/tgl-vecow-spc-7100-Corei7/shared.xml | 83 +++++-------- misc/config_tools/data/whl-ipc-i5/hybrid.xml | 50 +++----- .../data/whl-ipc-i5/hybrid_rt.xml | 62 +++------- .../data/whl-ipc-i5/partitioned.xml | 38 +++--- misc/config_tools/data/whl-ipc-i5/sdc.xml | 24 ---- misc/config_tools/data/whl-ipc-i5/shared.xml | 98 +++------------- 20 files changed, 290 insertions(+), 936 deletions(-) diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid.xml b/misc/config_tools/data/cfl-k700-i7/hybrid.xml index f00f4f60d..5634c505a 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid.xml @@ -51,6 +51,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + SAFETY_VM0 + 0x2F8 + + + ACRN_Service_VM + 0x2F8 + + + STANDARD_VM @@ -85,24 +99,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - - - - n n @@ -139,21 +138,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -177,21 +164,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -213,21 +188,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml index 8aee95527..b8d6bd03b 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -57,6 +57,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + PRE_RT_VM0 + 0x2F8 + + + ACRN_Service_VM + 0x2F8 + + + RTVM @@ -96,21 +110,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:1f.6 Ethernet controller: Intel Corporation Ethernet Connection (7) I219-LM (rev 10) 01:00.0 Non-Volatile memory controller: Silicon Motion, Inc. SM2263EN/SM2263XT SSD Controller (rev 03) @@ -154,21 +156,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -196,21 +186,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -234,21 +212,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml index 01e306d39..32071cf89 100644 --- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml +++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml @@ -51,6 +51,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + PRE_STD_VM0 + 0x2F8 + + + PRE_STD_VM1 + 0x2F8 + + + STANDARD_VM @@ -87,21 +101,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:17.0 SATA controller: Intel Corporation Cannon Lake PCH SATA AHCI Controller (rev 10) 00:1f.6 Ethernet controller: Intel Corporation Ethernet Connection (7) I219-LM (rev 10) @@ -147,21 +149,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:14.0 USB controller: Intel Corporation Cannon Lake PCH USB 3.1 xHCI Host Controller (rev 10) diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml index 952188c9c..5c088c4cb 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared.xml @@ -44,6 +44,20 @@ 0x00000010 \\EFI\\BOOT\\bootx64.efi + + + vUART connection 1 + legacy + + ACRN_Service_VM + 0x2F8 + + + POST_RT_VM1 + 0x2F8 + + + STANDARD_VM @@ -69,21 +83,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 2 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -109,21 +111,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - RTVM @@ -146,21 +136,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -184,21 +162,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -222,21 +188,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -260,21 +214,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -298,21 +240,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index a74b67833..bdff6a8e1 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -51,6 +51,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + SAFETY_VM0 + 0x2F8 + + + ACRN_Service_VM + 0x2F8 + + + STANDARD_VM @@ -85,21 +99,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -138,21 +140,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -176,21 +166,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -212,21 +190,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index db73d9eed..675199db9 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -70,6 +70,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + PRE_RT_VM0 + 0x2F8 + + + ACRN_Service_VM + 0x2F8 + + + RTVM @@ -106,21 +120,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20) 58:00.0 Ethernet controller: Intel Corporation Device 15f2 (rev 03) @@ -157,21 +159,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 0 - 1 - @@ -197,21 +187,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 0 - 1 - n @@ -233,21 +211,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index 2f612ef97..604b5facd 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -51,6 +51,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + PRE_STD_VM0 + 0x2F8 + + + PRE_STD_VM1 + 0x2F8 + + + STANDARD_VM @@ -87,21 +101,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20) 58:00.0 Ethernet controller: Intel Corporation Device 15f2 (rev 03) @@ -147,21 +149,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:14.0 USB controller: Intel Corporation Device a0ed (rev 20) diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml index 60a04b8be..468ee62b4 100644 --- a/misc/config_tools/data/generic_board/shared.xml +++ b/misc/config_tools/data/generic_board/shared.xml @@ -51,6 +51,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + ACRN_Service_VM + 0x2F8 + + + POST_RT_VM1 + 0x2F8 + + + STANDARD_VM @@ -76,21 +90,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 2 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -116,21 +118,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -155,21 +145,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -193,21 +171,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -231,21 +197,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -269,21 +223,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -307,21 +249,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml index dc301a21c..f30a9303d 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml @@ -51,6 +51,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + SAFETY_VM0 + 0x2F8 + + + ACRN_Service_VM + 0x2F8 + + + STANDARD_VM @@ -85,21 +99,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -138,21 +140,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -176,21 +166,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -212,21 +190,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index ac5978b90..c0e1e3023 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -51,6 +51,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + PRE_STD_VM0 + 0x2F8 + + + PRE_STD_VM1 + 0x2F8 + + + STANDARD_VM @@ -87,21 +101,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20) 58:00.0 Ethernet controller: Intel Corporation Device 15f2 (rev 03) @@ -147,21 +149,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:14.0 USB controller: Intel Corporation Device a0ed (rev 20) diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml index 7b2c60b42..1e47addd3 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared.xml @@ -51,6 +51,32 @@ 0x00000010 + + + Connection_1 + legacy + + ACRN_Service_VM + 0x3F + + + POST_STD_VM1 + 0x3F + + + + Connection_2 + pci + + ACRN_Service_VM + 00:10.0 + + + POST_RT_VM1 + 00:10.0 + + + STANDARD_VM @@ -76,21 +102,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 2 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -116,21 +130,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -155,21 +157,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -193,21 +183,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -231,21 +209,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -269,21 +235,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -307,21 +261,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml index 731e65f8b..67dc43e15 100644 --- a/misc/config_tools/data/qemu/shared.xml +++ b/misc/config_tools/data/qemu/shared.xml @@ -44,6 +44,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + ACRN_Service_VM + 0x2F8 + + + POST_STD_VM1 + 0x2F8 + + + STANDARD_VM @@ -68,21 +82,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - SERVICE_VM_COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -106,20 +108,8 @@ INVALID_COM_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 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 60ee3115f..0f5f13d95 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 @@ -51,6 +51,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + SAFETY_VM0 + 0x2F8 + + + ACRN_Service_VM + 0x2F8 + + + STANDARD_VM @@ -85,21 +99,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -139,21 +141,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -177,21 +167,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -213,21 +191,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml index f12d47021..fe82a8ea4 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml @@ -51,6 +51,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + PRE_STD_VM0 + 0x2F8 + + + PRE_STD_VM1 + 0x2F8 + + + STANDARD_VM @@ -87,21 +101,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:17.0 SATA controller: Intel Corporation Device a0d3 (rev 20) 00:1f.6 Ethernet controller: Intel Corporation Ethernet Connection (13) I219-LM (rev 20) @@ -147,21 +149,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:14.0 USB controller: Intel Corporation Tiger Lake-LP USB 3.2 Gen 2x1 xHCI Host Controller (rev 20) diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml index 38a2ef472..7a9e6523b 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml @@ -51,6 +51,32 @@ 0x00000010 + + + vUART connection 1 + legacy + + ACRN_Service_VM + 0x2F8 + + + POST_STD_VM1 + 0x2F8 + + + + vUART connection 2 + legacy + + ACRN_Service_VM + 0x3E8 + + + POST_RT_VM1 + 0x3E8 + + + STANDARD_VM @@ -77,28 +103,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 1 - 1 - - - VUART_LEGACY_PIO - SERVICE_VM_COM3_BASE - SERVICE_VM_COM3_IRQ - 2 - 2 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -124,28 +131,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n PRIO_LOW @@ -171,28 +159,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM3_IRQ - 0 - 2 - - - VUART_LEGACY_PIO - COM3_BASE - COM3_IRQ - 0 - 2 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n PRIO_LOW diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index eb2aa349c..f8151365b 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -43,6 +43,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + SAFETY_VM0 + 0x2F8 + + + ACRN_Service_VM + 0x2F8 + + + STANDARD_VM @@ -76,21 +90,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -128,21 +130,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -166,21 +156,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml index b1a57f932..989aa4d3f 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml @@ -56,6 +56,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + PRE_RT_VM0 + 0x2F8 + + + ACRN_Service_VM + 0x2F8 + + + RTVM @@ -95,21 +109,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:17.0 SATA controller: Intel Corporation Device 9dd3 (rev 30) 03:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) @@ -146,21 +148,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -186,21 +176,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -222,21 +200,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 0 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index 3ec7f85cb..937dbdfa0 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -43,6 +43,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + PRE_STD_VM0 + 0x2F8 + + + PRE_STD_VM1 + 0x2F8 + + + STANDARD_VM @@ -81,21 +95,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:17.0 SATA controller: Intel Corporation Cannon Point-LP SATA Controller [AHCI Mode] (rev 30) 04:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) @@ -141,21 +143,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - 00:14.0 USB controller: Intel Corporation Cannon Point-LP USB 3.1 xHCI Controller (rev 30) 03:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03) diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml index 4773be527..3f174c7f4 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml @@ -67,21 +67,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - SERVICE_VM_COM2_IRQ - 1 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -107,21 +95,9 @@ INVALID_COM_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml index e2231afda..9ec8457bf 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared.xml @@ -43,6 +43,20 @@ 0x00000010 + + + vUART connection 1 + legacy + + ACRN_Service_VM + 0x2F8 + + + POST_RT_VM1 + 0x2F8 + + + STANDARD_VM @@ -68,21 +82,9 @@ SERVICE_VM_COM1_BASE SERVICE_VM_COM1_IRQ - - VUART_LEGACY_PIO - SERVICE_VM_COM2_BASE - SERVICE_VM_COM2_IRQ - 2 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - @@ -108,21 +110,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - RTVM @@ -145,21 +135,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -183,21 +161,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -221,21 +187,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -259,21 +213,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n @@ -297,21 +239,9 @@ COM1_BASE COM1_IRQ - - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - INVALID_PCI_BASE - - INVALID_PCI_BASE - 1 - 1 - n