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 33796090d..bae59d133 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -39,7 +39,6 @@ 16 0x100 - 256 1 96 120 diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml index 93dd813bc..b741663d8 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared.xml @@ -39,7 +39,6 @@ 16 0x100 - 256 1 96 120 diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid/generic_board.config b/misc/config_tools/data/generic_board/generic_code/hybrid/generic_board.config index 345fc9af2..f082018f7 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid/generic_board.config +++ b/misc/config_tools/data/generic_board/generic_code/hybrid/generic_board.config @@ -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 diff --git a/misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config b/misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config index 91e866e5d..d167866d7 100644 --- a/misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config +++ b/misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config @@ -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 diff --git a/misc/config_tools/data/generic_board/generic_code/shared/generic_board.config b/misc/config_tools/data/generic_board/generic_code/shared/generic_board.config index 345fc9af2..f082018f7 100644 --- a/misc/config_tools/data/generic_board/generic_code/shared/generic_board.config +++ b/misc/config_tools/data/generic_board/generic_code/shared/generic_board.config @@ -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 diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index 0ee230630..c9186de62 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -47,7 +47,6 @@ 16 0x100 - 256 1 96 120 @@ -249,4 +248,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 80cf09e01..08936c1e5 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -52,7 +52,6 @@ 16 0x100 - 256 1 96 120 @@ -258,4 +257,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index ab44878a3..1f59df904 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -47,7 +47,6 @@ 16 0x100 - 256 1 96 120 @@ -181,4 +180,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml index e8d0d7085..1dd398df1 100644 --- a/misc/config_tools/data/generic_board/shared.xml +++ b/misc/config_tools/data/generic_board/shared.xml @@ -47,7 +47,6 @@ 16 0x100 - 256 1 96 120 @@ -350,4 +349,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml index 59b769d03..dc5de8f4d 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml @@ -47,7 +47,6 @@ 16 0x100 - 256 1 96 120 @@ -249,4 +248,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index 8f27884a8..fffc01f79 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -47,7 +47,6 @@ 16 0x100 - 256 1 96 120 @@ -181,4 +180,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml index ca1aad25b..6a7482e97 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared.xml @@ -47,7 +47,6 @@ 16 0x100 - 256 1 96 120 @@ -350,4 +349,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml index ef269c2b7..9a94bec65 100644 --- a/misc/config_tools/data/qemu/sdc.xml +++ b/misc/config_tools/data/qemu/sdc.xml @@ -40,7 +40,6 @@ 16 0x100 - 256 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 f545b7c94..8a088704e 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -39,7 +39,6 @@ 16 0x100 - 256 1 96 120 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 ab19bf2ae..b53834f37 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml @@ -39,7 +39,6 @@ 16 0x100 - 256 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 1d1921ea9..f99ca2dd8 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -39,7 +39,6 @@ 16 0x100 - 256 1 96 120 diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml index 71c6ec485..87acd83c4 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml @@ -39,7 +39,6 @@ 16 0x100 - 256 1 96 120 diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml index 3cd3c1b89..d12bbad81 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared.xml @@ -39,7 +39,6 @@ 16 0x100 - 256 1 96 120 diff --git a/misc/config_tools/hv_config/board_defconfig.py b/misc/config_tools/hv_config/board_defconfig.py index f4200e5ae..6b73bcd22 100644 --- a/misc/config_tools/hv_config/board_defconfig.py +++ b/misc/config_tools/hv_config/board_defconfig.py @@ -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) diff --git a/misc/config_tools/hv_config/hv_item.py b/misc/config_tools/hv_config/hv_item.py index 59ba18243..9c48498d1 100644 --- a/misc/config_tools/hv_config/hv_item.py +++ b/misc/config_tools/hv_config/hv_item.py @@ -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") diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index 6cae7d0ee..813708134 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -227,11 +227,6 @@ maximum supported resource. initialization. - - - Maximum number of Interrupt Remapping Entries. - - Maximum number of IOAPICs. diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index 92c4fa357..e4765c28e 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -163,10 +163,6 @@ - - - -