From 75a4dde1487c0c5fb286e84f8de470e48ec7a765 Mon Sep 17 00:00:00 2001 From: "Yang,Yu-chu" Date: Wed, 27 Oct 2021 17:39:20 -0700 Subject: [PATCH] config-tools: allow to use polling mode for legacy vuart Using polling mode When set a legacy vuart's irq to 0. Tracked-On: #6652 Signed-off-by: Yang,Yu-chu --- misc/config_tools/library/scenario_cfg_lib.py | 2 +- misc/config_tools/schema/VMtypes.xsd | 6 ++++-- misc/config_tools/static_allocators/intx.py | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/misc/config_tools/library/scenario_cfg_lib.py b/misc/config_tools/library/scenario_cfg_lib.py index 909ac9c65..49a269f5f 100644 --- a/misc/config_tools/library/scenario_cfg_lib.py +++ b/misc/config_tools/library/scenario_cfg_lib.py @@ -28,7 +28,7 @@ AVALIBLE_COM1_BASE = [INVALID_COM_BASE, 'COM1_BASE'] AVALIBLE_COM2_BASE = [INVALID_COM_BASE, 'COM2_BASE'] VUART_IRQ = ['SOS_COM1_IRQ', 'SOS_COM2_IRQ', 'SOS_COM3_IRQ', 'SOS_COM4_IRQ', - 'COM1_IRQ', 'COM2_IRQ', 'COM3_IRQ', 'COM4_IRQ', 'CONFIG_COM_IRQ'] + 'COM1_IRQ', 'COM2_IRQ', 'COM3_IRQ', 'COM4_IRQ', 'CONFIG_COM_IRQ', '0'] # Support 512M, 1G, 2G # pre launch less then 2G, sos vm less than 24G diff --git a/misc/config_tools/schema/VMtypes.xsd b/misc/config_tools/schema/VMtypes.xsd index 6f398815c..4541ec79d 100644 --- a/misc/config_tools/schema/VMtypes.xsd +++ b/misc/config_tools/schema/VMtypes.xsd @@ -247,8 +247,9 @@ must exactly match the module tag in the GRUB multiboot cmdline. A string with either ``SOS_COM1_IRQ``, ``SOS_COM2_IRQ``, ``SOS_COM3_IRQ``, ``SOS_COM4_IRQ``, -``COM1_IRQ``, ``COM2_IRQ``, ``COM3_IRQ``, ``COM4_IRQ`` -or ``CONFIG_COM_IRQ``. +``COM1_IRQ``, ``COM2_IRQ``, ``COM3_IRQ``, ``COM4_IRQ``, +``CONFIG_COM_IRQ`` or ``0``. If ``0`` is set, the vuart will +use polling mode. @@ -260,6 +261,7 @@ or ``CONFIG_COM_IRQ``. + diff --git a/misc/config_tools/static_allocators/intx.py b/misc/config_tools/static_allocators/intx.py index 16f800938..cd862e5a1 100644 --- a/misc/config_tools/static_allocators/intx.py +++ b/misc/config_tools/static_allocators/intx.py @@ -63,6 +63,8 @@ def assign_legacy_vuart_irqs(vm_node, legacy_vuart_id, irq_list): legacy_vuart_irq = '3' if legacy_vuart_irq in irq_list: remove_irq(irq_list, legacy_vuart_irq) + elif legacy_vuart_node_irq_text == '0': + legacy_vuart_irq = '0' else: legacy_vuart_irq = alloc_irq(irq_list) return legacy_vuart_irq