OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

config_tools: remove CONFIG_MAX_IR_ENTRIES 

remove CONFIG_MAX_IR_ENTRIES the related python code, schema and
all existing scenario XML files since PR #6809 have changed it.

Tracked-On: #6745
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
This commit is contained in:
Kunhui-Li 2021-11-23 17:51:26 +08:00 committed by wenlingz
parent fcb0469bce
commit 711619f92e
22 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<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.xml
View File

@ -39,7 +39,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<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/generic_code/hybrid/generic_board.config
View File

@ -18,7 +18,6 @@ CONFIG_L1D_FLUSH_VMENTRY_ENABLED=n
CONFIG_MCE_ON_PSC_WORKAROUND_DISABLED=n
CONFIG_IOMMU_BUS_NUM=0x100
CONFIG_MAX_IOAPIC_NUM=1
CONFIG_MAX_IR_ENTRIES=256
CONFIG_MAX_PCI_DEV_NUM=96
CONFIG_MAX_IOAPIC_LINES=120
CONFIG_MAX_PT_IRQ_ENTRIES=256

1
misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config
View File

@ -18,7 +18,6 @@ CONFIG_L1D_FLUSH_VMENTRY_ENABLED=n
CONFIG_MCE_ON_PSC_WORKAROUND_DISABLED=n
CONFIG_IOMMU_BUS_NUM=0x100
CONFIG_MAX_IOAPIC_NUM=1
CONFIG_MAX_IR_ENTRIES=256
CONFIG_MAX_PCI_DEV_NUM=96
CONFIG_MAX_IOAPIC_LINES=120
CONFIG_MAX_PT_IRQ_ENTRIES=64

1
misc/config_tools/data/generic_board/generic_code/shared/generic_board.config
View File

@ -18,7 +18,6 @@ CONFIG_L1D_FLUSH_VMENTRY_ENABLED=n
CONFIG_MCE_ON_PSC_WORKAROUND_DISABLED=n
CONFIG_IOMMU_BUS_NUM=0x100
CONFIG_MAX_IOAPIC_NUM=1
CONFIG_MAX_IR_ENTRIES=256
CONFIG_MAX_PCI_DEV_NUM=96
CONFIG_MAX_IOAPIC_LINES=120
CONFIG_MAX_PT_IRQ_ENTRIES=256

3
misc/config_tools/data/generic_board/hybrid.xml
View File

@ -47,7 +47,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
@ -249,4 +248,4 @@
</communication_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

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

@ -52,7 +52,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
@ -258,4 +257,4 @@
</communication_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

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

@ -47,7 +47,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
@ -181,4 +180,4 @@
<TPM2>n</TPM2>
</mmio_resources>
</vm>
</acrn-config>
</acrn-config>

3
misc/config_tools/data/generic_board/shared.xml
View File

@ -47,7 +47,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
@ -350,4 +349,4 @@
</communication_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

3
misc/config_tools/data/nuc11tnbi5/hybrid.xml
View File

@ -47,7 +47,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
@ -249,4 +248,4 @@
</communication_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

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

@ -47,7 +47,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
@ -181,4 +180,4 @@
<TPM2>n</TPM2>
</mmio_resources>
</vm>
</acrn-config>
</acrn-config>

3
misc/config_tools/data/nuc11tnbi5/shared.xml
View File

@ -47,7 +47,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
@ -350,4 +349,4 @@
</communication_vuart>
<PTM>n</PTM>
</vm>
</acrn-config>
</acrn-config>

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

@ -40,7 +40,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<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

@ -39,7 +39,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<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.xml
View File

@ -39,7 +39,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<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

@ -39,7 +39,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<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/sdc.xml
View File

@ -39,7 +39,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<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.xml
View File

@ -39,7 +39,6 @@
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<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

@ -161,7 +161,6 @@ 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_IR_ENTRIES={}".format(hv_info.cap.max_ir_entries), 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)
print("CONFIG_MAX_PT_IRQ_ENTRIES={}".format(hv_info.cap.max_pt_irq_entries), file=config)

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

@ -55,7 +55,6 @@ class CapHv:
self.max_pt_irq_entries = 0
self.max_ioapic_num = 0
self.max_ioapic_lines = 0
self.max_ir_entries = 0
self.iommu_bus_num = 0
self.max_pci_dev_num = 0
self.max_msix_table_num = 0
@ -65,7 +64,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.max_ir_entries = common.get_hv_item_tag(self.hv_file, "CAPACITIES", "MAX_IR_ENTRIES")
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")
@ -75,7 +73,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.ir_entries_check(self.max_ir_entries, "CAPACITIES", "MAX_IR_ENTRIES")
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")

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

@ -227,11 +227,6 @@ maximum supported resource.</xs:documentation>
initialization.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="MAX_IR_ENTRIES" type="xs:integer" default="256">
<xs:annotation>
<xs:documentation>Maximum number of Interrupt Remapping Entries.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="MAX_IOAPIC_NUM" default="1">
<xs:annotation>
<xs:documentation>Maximum number of IOAPICs.</xs:documentation>

4
misc/config_tools/xforms/config_common.xsl
View File

@ -163,10 +163,6 @@
<xsl:with-param name="key" select="'MAX_IOAPIC_NUM'" />
</xsl:call-template>
<xsl:call-template name="integer-by-key">
<xsl:with-param name="key" select="'MAX_IR_ENTRIES'" />
</xsl:call-template>
<xsl:call-template name="integer-by-key">
<xsl:with-param name="key" select="'MAX_PCI_DEV_NUM'" />
</xsl:call-template>