config_tools: add a new entry MAX_EFI_MMAP_ENTRIES

It is used to specify the maximum number of EFI memmap entries.

On some platforms, like Tiger Lake, the number of EFI memmap entries
becomes 268 when the BIOS settings are changed.
The current value of MAX_EFI_MMAP_ENTRIES (256) defined in hypervisor
is not big enough to cover such cases.

As the number of EFI memmap entries depends on the platforms and the
BIOS settings, this patch introduces a new entry MAX_EFI_MMAP_ENTRIES
in configurations so that it can be adjusted for different cases.

Tracked-On: #6442

Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
This commit is contained in:
Shiqing Gao
2021-08-12 16:51:58 +08:00
committed by wenlingz
parent 84e975b14d
commit 4056bb42c6
39 changed files with 47 additions and 5 deletions

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -57,6 +57,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -57,6 +57,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -60,6 +60,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -57,6 +57,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -60,6 +60,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -57,6 +57,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -57,6 +57,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -48,6 +48,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -48,6 +48,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -48,6 +48,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -48,6 +48,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -48,6 +48,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -48,6 +48,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -52,6 +52,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>300</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -55,6 +55,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>300</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -51,6 +51,7 @@
</MEMORY>
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>300</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -52,6 +52,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>300</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -52,6 +52,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>300</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -44,6 +44,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>

View File

@@ -48,6 +48,7 @@
<CAPACITIES>
<IOMMU_BUS_NUM>0x100</IOMMU_BUS_NUM>
<MAX_EFI_MMAP_ENTRIES>256</MAX_EFI_MMAP_ENTRIES>
<MAX_IR_ENTRIES>256</MAX_IR_ENTRIES>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>