github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-19 12:12:16 +00:00
Code Issues Projects Releases Wiki Activity

config_tools: remove CONFIG_IOMMU_BUS_NUM

Browse Source 
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 <kunhuix.li@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Kunhui-Li 2022-03-17 11:24:36 +08:00 committed by acrnsi-robot
parent b6538a4299
commit e1f5c32ea2
27 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
View File

@ -47,7 +47,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/cfl-k700-i7/partitioned.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
View File

@ -31,7 +31,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

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

@ -60,7 +60,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/generic_board/partitioned.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/nuc11tnbi5/partitioned.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/qemu/shared.xml
View File

@ -32,7 +32,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
View File

@ -39,7 +39,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/whl-ipc-i5/hybrid.xml
View File

@ -31,7 +31,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
View File

@ -47,7 +47,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/whl-ipc-i5/partitioned.xml
View File

@ -31,7 +31,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
View File

@ -31,7 +31,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
View File

@ -31,7 +31,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
View File

@ -31,7 +31,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
View File

@ -31,7 +31,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
View File

@ -31,7 +31,6 @@
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>

1
misc/config_tools/hv_config/board_defconfig.py
View File

@ -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)

3
misc/config_tools/hv_config/hv_item.py
View File

@ -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")

1
misc/config_tools/scenario_config/upgrader.py
View File

@ -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."),

5
misc/config_tools/schema/config.xsd
View File

@ -150,11 +150,6 @@
<xs:documentation>Maximum number of User VMs allowed.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="IOMMU_BUS_NUM" type="HexFormat" default="0x100">
<xs:annotation acrn:views="">
<xs:documentation>Highest PCI bus ID used during IOMMU initialization.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="MAX_IOAPIC_NUM" default="1">
<xs:annotation acrn:views="">
<xs:documentation>Maximum number of IOAPICs.</xs:documentation>