From 2f5db5f4ee55323b60231e5dbd8111f270025a00 Mon Sep 17 00:00:00 2001 From: Kunhui-Li Date: Wed, 3 Nov 2021 17:31:16 +0800 Subject: [PATCH] Revert "misc: config_tools: add vuart for communication" This reverts commit 9e2edd5192d217c8a3eff704d728ae2b9d0085c1. 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 --- .../data/cfl-k700-i7/hybrid_rt.xml | 34 +----- misc/config_tools/data/cfl-k700-i7/shared.xml | 96 +--------------- .../data/generic_board/hybrid.xml | 50 ++------ .../data/generic_board/hybrid_rt.xml | 50 ++------ .../data/generic_board/shared.xml | 108 ++---------------- misc/config_tools/data/nuc11tnbi5/hybrid.xml | 50 ++------ misc/config_tools/data/nuc11tnbi5/shared.xml | 108 ++---------------- misc/config_tools/data/qemu/sdc.xml | 8 +- misc/config_tools/data/whl-ipc-i5/hybrid.xml | 20 +--- .../data/whl-ipc-i5/hybrid_rt.xml | 34 +----- misc/config_tools/data/whl-ipc-i5/sdc.xml | 22 +--- misc/config_tools/data/whl-ipc-i5/shared.xml | 96 +--------------- 12 files changed, 86 insertions(+), 590 deletions(-) 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 037a7bc23..94b335329 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -161,25 +161,11 @@ VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ 0 1 - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 2 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 3 - 2 - INVALID_PCI_BASE @@ -194,7 +180,7 @@ /dev/nvme0n1p3 - rw rootwait console=ttyS0,115200n8 ignore_loglevel no_timer_check 8250.nr_uarts=20 + rw rootwait console=ttyS0,115200n8 ignore_loglevel no_timer_check @@ -229,13 +215,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 2 - INVALID_PCI_BASE @@ -275,13 +254,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 3 - INVALID_PCI_BASE diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml index f70ab8f47..fed730d44 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared.xml @@ -86,52 +86,10 @@ VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 1 - 1 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ 2 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 3 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 4 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 5 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 6 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 7 - 2 + 1 INVALID_PCI_BASE @@ -148,7 +106,7 @@ /dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 8250.nr_uarts=20 + i915.nuclear_pageflip=1 @@ -176,7 +134,7 @@ VUART_LEGACY_PIO - COM2_BASE + INVALID_COM_BASE COM2_IRQ 0 1 @@ -213,18 +171,11 @@ COM1_IRQ - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - VUART_LEGACY_PIO COM2_BASE COM2_IRQ 0 - 2 + 1 INVALID_PCI_BASE @@ -265,13 +216,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 3 - INVALID_PCI_BASE @@ -311,13 +255,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 4 - INVALID_PCI_BASE @@ -357,13 +294,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 5 - INVALID_PCI_BASE @@ -403,13 +333,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 6 - INVALID_PCI_BASE @@ -446,13 +369,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 7 - INVALID_PCI_BASE diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index 1607d483c..ef2bcb423 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -96,11 +96,11 @@ COM1_IRQ - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 1 + 1 INVALID_PCI_BASE @@ -150,25 +150,11 @@ SERVICE_VM_COM1_IRQ - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 0 - 1 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 2 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 3 - 2 + VUART_LEGACY_PIO + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ + 0 + 1 INVALID_PCI_BASE @@ -184,7 +170,7 @@ /dev/nvme0n1p3 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 @@ -215,13 +201,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 2 - INVALID_PCI_BASE @@ -259,13 +238,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 3 - INVALID_PCI_BASE diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 798792681..03a3c8eb5 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -104,11 +104,11 @@ COM1_IRQ - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 1 + 1 INVALID_PCI_BASE @@ -156,25 +156,11 @@ SERVICE_VM_COM1_IRQ - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 0 - 1 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 2 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 3 - 2 + VUART_LEGACY_PIO + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ + 0 + 1 INVALID_PCI_BASE @@ -191,7 +177,7 @@ /dev/nvme0n1p3 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 @@ -225,13 +211,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 2 - INVALID_PCI_BASE @@ -270,13 +249,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 3 - INVALID_PCI_BASE diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml index 7c2de872f..804790cc8 100644 --- a/misc/config_tools/data/generic_board/shared.xml +++ b/misc/config_tools/data/generic_board/shared.xml @@ -86,53 +86,11 @@ SERVICE_VM_COM1_IRQ - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 1 - 1 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 2 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 3 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 4 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 5 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 6 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 7 - 2 + VUART_LEGACY_PIO + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ + 2 + 1 INVALID_PCI_BASE @@ -148,7 +106,7 @@ /dev/nvme0n1p3 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 @@ -175,11 +133,11 @@ COM1_IRQ - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 1 INVALID_PCI_BASE @@ -216,18 +174,11 @@ VUART_LEGACY_PIO - INVALID_COM_BASE + COM2_BASE COM2_IRQ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 2 - INVALID_PCI_BASE @@ -267,13 +218,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 3 - INVALID_PCI_BASE @@ -313,13 +257,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 4 - INVALID_PCI_BASE @@ -359,13 +296,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 5 - INVALID_PCI_BASE @@ -405,13 +335,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 6 - INVALID_PCI_BASE @@ -448,13 +371,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 7 - INVALID_PCI_BASE diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml index d8e21256d..0d068a1d7 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml @@ -96,11 +96,11 @@ COM1_IRQ - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 1 + VUART_LEGACY_PIO + COM2_BASE + COM2_IRQ + 1 + 1 INVALID_PCI_BASE @@ -150,25 +150,11 @@ SERVICE_VM_COM1_IRQ - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 0 - 1 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 2 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 3 - 2 + VUART_LEGACY_PIO + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ + 0 + 1 INVALID_PCI_BASE @@ -184,7 +170,7 @@ /dev/nvme0n1p3 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 @@ -215,13 +201,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 2 - INVALID_PCI_BASE @@ -259,13 +238,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 3 - INVALID_PCI_BASE diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml index c4455daa0..dfe2f1e46 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared.xml @@ -86,53 +86,11 @@ SERVICE_VM_COM1_IRQ - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 1 - 1 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 2 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 3 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 4 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 5 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 6 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 7 - 2 + VUART_LEGACY_PIO + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ + 2 + 1 INVALID_PCI_BASE @@ -148,7 +106,7 @@ /dev/nvme0n1p3 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 @@ -175,11 +133,11 @@ COM1_IRQ - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 1 + VUART_LEGACY_PIO + INVALID_COM_BASE + COM2_IRQ + 0 + 1 INVALID_PCI_BASE @@ -216,18 +174,11 @@ VUART_LEGACY_PIO - INVALID_COM_BASE + COM2_BASE COM2_IRQ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 2 - INVALID_PCI_BASE @@ -267,13 +218,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 3 - INVALID_PCI_BASE @@ -313,13 +257,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 4 - INVALID_PCI_BASE @@ -359,13 +296,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 5 - INVALID_PCI_BASE @@ -405,13 +335,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 6 - INVALID_PCI_BASE @@ -448,13 +371,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 7 - INVALID_PCI_BASE diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml index 766415484..392aaa36f 100644 --- a/misc/config_tools/data/qemu/sdc.xml +++ b/misc/config_tools/data/qemu/sdc.xml @@ -85,8 +85,8 @@ VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 + INVALID_COM_BASE + SERVICE_VM_COM2_IRQ 1 1 @@ -105,7 +105,7 @@ /dev/vda1 earlyprintk=serial,ttyS0,115200n8 rw rootwait console=tty0 consoleblank=0 no_timer_check ignore_loglevel - ignore_loglevel no_timer_check intel_iommu=off tsc=reliable 8250.nr_uarts=20 + ignore_loglevel no_timer_check intel_iommu=off tsc=reliable @@ -131,7 +131,7 @@ VUART_LEGACY_PIO - COM2_BASE + INVALID_COM_BASE COM2_IRQ 0 1 diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index 3879df067..58c2c7ca4 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -147,18 +147,11 @@ VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ 0 1 - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 2 - 2 - INVALID_PCI_BASE @@ -174,7 +167,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 8250.nr_uarts=20 + i915.nuclear_pageflip=1 @@ -205,13 +198,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 2 - INVALID_PCI_BASE 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 aa68bbf42..8442387eb 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml @@ -152,25 +152,11 @@ VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ 0 1 - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 2 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 3 - 2 - INVALID_PCI_BASE @@ -186,7 +172,7 @@ /dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 8250.nr_uarts=20 + i915.nuclear_pageflip=1 @@ -219,13 +205,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 2 - INVALID_PCI_BASE @@ -263,13 +242,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 1 - 3 - INVALID_PCI_BASE diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml index 17e04e50d..72fc75a33 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml @@ -84,18 +84,11 @@ VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 + INVALID_COM_BASE + SERVICE_VM_COM2_IRQ 1 1 - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 2 - 2 - INVALID_PCI_BASE @@ -111,7 +104,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 8250.nr_uarts=20 + i915.nuclear_pageflip=1 @@ -139,7 +132,7 @@ VUART_LEGACY_PIO - COM2_BASE + INVALID_COM_BASE COM2_IRQ 0 1 @@ -178,13 +171,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 2 - INVALID_PCI_BASE diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml index 6e2ac651a..bf0c7829c 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared.xml @@ -85,52 +85,10 @@ VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 1 - 1 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 + SERVICE_VM_COM2_BASE + SERVICE_VM_COM2_IRQ 2 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 3 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 4 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 5 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 6 - 2 - - - VUART_LEGACY_PIO - CONFIG_COM_BASE - 0 - 7 - 2 + 1 INVALID_PCI_BASE @@ -147,7 +105,7 @@ /dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 8250.nr_uarts=20 + i915.nuclear_pageflip=1 @@ -175,7 +133,7 @@ VUART_LEGACY_PIO - COM2_BASE + INVALID_COM_BASE COM2_IRQ 0 1 @@ -212,18 +170,11 @@ COM1_IRQ - VUART_LEGACY_PIO - INVALID_COM_BASE - COM2_IRQ - 0 - 1 - - VUART_LEGACY_PIO COM2_BASE COM2_IRQ 0 - 2 + 1 INVALID_PCI_BASE @@ -264,13 +215,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 3 - INVALID_PCI_BASE @@ -310,13 +254,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 4 - INVALID_PCI_BASE @@ -356,13 +293,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 5 - INVALID_PCI_BASE @@ -402,13 +332,6 @@ 0 1 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 6 - INVALID_PCI_BASE @@ -445,13 +368,6 @@ 0 0 - - VUART_LEGACY_PIO - COM2_BASE - COM2_IRQ - 0 - 7 - INVALID_PCI_BASE