From e1f5c32ea249bd4b90e58520fb9e80b85b15578c Mon Sep 17 00:00:00 2001 From: Kunhui-Li Date: Thu, 17 Mar 2022 11:24:36 +0800 Subject: [PATCH] config_tools: remove CONFIG_IOMMU_BUS_NUM Since PR #6943 has landed, the `CONFIG_IOMMU_BUS_NUM` has been renamed to `ACFG_MAX_PCI_BUS_NUM`, this patch removes the obsolete code about `CONFIG_IOMMU_BUS_NUM`. v1-->v2: Update the upgrader.py to add a description of this obsoleted item. Tracked-On: #6942 Signed-off-by: Kunhui-Li Reviewed-by: Junjie Mao --- .../config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml | 1 - misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml | 1 - misc/config_tools/data/cfl-k700-i7/partitioned.xml | 1 - .../config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml | 1 - .../data/generic_board/hybrid_launch_2user_vm.xml | 1 - misc/config_tools/data/generic_board/hybrid_rt.xml | 1 - misc/config_tools/data/generic_board/partitioned.xml | 1 - .../data/generic_board/shared_launch_6user_vm.xml | 1 - misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml | 1 - misc/config_tools/data/nuc11tnbi5/partitioned.xml | 1 - misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml | 1 - misc/config_tools/data/qemu/shared.xml | 1 - misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml | 1 - .../data/tgl-vecow-spc-7100-Corei7/partitioned.xml | 1 - .../tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml | 1 - misc/config_tools/data/whl-ipc-i5/hybrid.xml | 1 - .../data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml | 1 - misc/config_tools/data/whl-ipc-i5/partitioned.xml | 1 - .../data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml | 1 - .../data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml | 1 - .../data/whl-ipc-i5/shared_launch_1user_vm_waag.xml | 1 - misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml | 1 - misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml | 1 - misc/config_tools/hv_config/board_defconfig.py | 1 - misc/config_tools/hv_config/hv_item.py | 3 --- misc/config_tools/scenario_config/upgrader.py | 1 + misc/config_tools/schema/config.xsd | 5 ----- 27 files changed, 1 insertion(+), 32 deletions(-) diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml index c38f245d4..d8d7b4404 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 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 f137fd47d..e6f3676c8 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -47,7 +47,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml index 3f6872af4..d426fd8e3 100644 --- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml +++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml index 1969f39b1..1fb5f549b 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml @@ -31,7 +31,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml index ddde00549..e6881b28b 100644 --- a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index c07eb79f5..720c979d5 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -60,7 +60,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index edaab617e..8469bd145 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml index 7a544746f..092279394 100644 --- a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml index 1f4d44677..01224fdd6 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index 0ece5d7eb..82dff5048 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml index c3918883c..37ddd82e7 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml index dbe514d4c..7b49b1267 100644 --- a/misc/config_tools/data/qemu/shared.xml +++ b/misc/config_tools/data/qemu/shared.xml @@ -32,7 +32,6 @@ 16 - 0x100 1 96 120 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 ab5102f6a..91cc72489 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 @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 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 1e8decc22..2c63cd003 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 @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml index d2c77abfe..32b6b0681 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml @@ -39,7 +39,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index 3f745b701..0fcb9a46a 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -31,7 +31,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml index 73364debf..0144e1cc2 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml @@ -47,7 +47,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index 2cc8da3ad..d94df2d79 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -31,7 +31,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml index d160c564c..7b71814bd 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml @@ -31,7 +31,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml index 827d63a8d..6b16961f7 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml @@ -31,7 +31,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml index d274d81f5..0fe361c46 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml @@ -31,7 +31,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml index 8ce20657e..147c98f6c 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml @@ -31,7 +31,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml index 2c68403e7..9649c8d3e 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml @@ -31,7 +31,6 @@ 16 - 0x100 1 96 120 diff --git a/misc/config_tools/hv_config/board_defconfig.py b/misc/config_tools/hv_config/board_defconfig.py index 3a390a89f..bfdb166c1 100644 --- a/misc/config_tools/hv_config/board_defconfig.py +++ b/misc/config_tools/hv_config/board_defconfig.py @@ -104,7 +104,6 @@ def get_features(hv_info, config): def get_capacities(hv_info, config): - print("CONFIG_IOMMU_BUS_NUM={}".format(hv_info.cap.iommu_bus_num), file=config) print("CONFIG_MAX_IOAPIC_NUM={}".format(hv_info.cap.max_ioapic_num), file=config) print("CONFIG_MAX_PCI_DEV_NUM={}".format(hv_info.cap.max_pci_dev_num), file=config) print("CONFIG_MAX_IOAPIC_LINES={}".format(hv_info.cap.max_ioapic_lines), file=config) diff --git a/misc/config_tools/hv_config/hv_item.py b/misc/config_tools/hv_config/hv_item.py index 4d08d611d..fa53ca32b 100644 --- a/misc/config_tools/hv_config/hv_item.py +++ b/misc/config_tools/hv_config/hv_item.py @@ -49,7 +49,6 @@ class CapHv: self.max_pt_irq_entries = 0 self.max_ioapic_num = 0 self.max_ioapic_lines = 0 - self.iommu_bus_num = 0 self.max_pci_dev_num = 0 self.max_msix_table_num = 0 @@ -58,7 +57,6 @@ class CapHv: self.max_pt_irq_entries = common.get_hv_item_tag(self.hv_file, "CAPACITIES", "MAX_PT_IRQ_ENTRIES") self.max_ioapic_num = common.get_hv_item_tag(self.hv_file, "CAPACITIES", "MAX_IOAPIC_NUM") self.max_ioapic_lines = common.get_hv_item_tag(self.hv_file, "CAPACITIES", "MAX_IOAPIC_LINES") - self.iommu_bus_num = common.get_hv_item_tag(self.hv_file, "CAPACITIES", "IOMMU_BUS_NUM") self.max_pci_dev_num = common.get_hv_item_tag(self.hv_file, "CAPACITIES", "MAX_PCI_DEV_NUM") self.max_msix_table_num = common.get_hv_item_tag(self.hv_file, "CAPACITIES", "MAX_MSIX_TABLE_NUM") @@ -67,7 +65,6 @@ class CapHv: hv_cfg_lib.hv_range_check(self.max_pt_irq_entries, "CAPACITIES", "MAX_PT_IRQ_ENTRIES", hv_cfg_lib.RANGE_DB['PT_IRQ_ENTRIES']) hv_cfg_lib.hv_range_check(self.max_ioapic_num, "CAPACITIES", "MAX_IOAPIC_NUM", hv_cfg_lib.RANGE_DB['IOAPIC_NUM']) hv_cfg_lib.hv_range_check(self.max_ioapic_lines, "CAPACITIES", "MAX_IOAPIC_LINES", hv_cfg_lib.RANGE_DB['IOAPIC_LINES']) - hv_cfg_lib.hv_size_check(self.iommu_bus_num, "CAPACITIES", "IOMMU_BUS_NUM") hv_cfg_lib.hv_range_check(self.max_pci_dev_num, "CAPACITIES", "MAX_PCI_DEV_NUM", hv_cfg_lib.RANGE_DB['PCI_DEV_NUM']) hv_cfg_lib.max_msix_table_num_check(self.max_msix_table_num, "CAPACITIES", "MAX_MSIX_TABLE_NUM") diff --git a/misc/config_tools/scenario_config/upgrader.py b/misc/config_tools/scenario_config/upgrader.py index 512844861..ce98197fd 100755 --- a/misc/config_tools/scenario_config/upgrader.py +++ b/misc/config_tools/scenario_config/upgrader.py @@ -684,6 +684,7 @@ class UpgradingScenarioStage(PipelineStage): filters = [ DiscardedDataFilter("hv/FEATURES/IVSHMEM", None, "IVSHMEM is now automatically enabled if any IVSHMEM region is specified."), DiscardedDataFilter("hv/FEATURES/NVMX_ENABLED", None, "Nest virtualization support is now automatically included if enabled for any VM."), + DiscardedDataFilter("hv/CAPACITIES/IOMMU_BUS_NUM", None, "The maximum bus number to be supported by ACRN IOMMU configuration is now inferred from board data."), DiscardedDataFilter("hv/MISC_CFG/UEFI_OS_LOADER_NAME", None, None), DiscardedDataFilter("vm/guest_flags/guest_flag", "0", None), DiscardedDataFilter("vm/epc_section/base", "0", "Post-launched VMs cannot have EPC sections."), diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index 8b989e522..b9209b416 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -150,11 +150,6 @@ Maximum number of User VMs allowed. - - - Highest PCI bus ID used during IOMMU initialization. - - Maximum number of IOAPICs.