config_tools: Revert "update scenario xml" for MAX_MSIX_TABLE_NUM

This reverts commit 24af7f8f9d which leaves
MAX_MSIX_TABLE_NUM item as empty for most of platforms except ehl-crb-b and
expect config tool to calculate a correct MAX_MSIX_TABLE_NUM for hypervisor
use. Unfortunately current config tool just calculate maximum native MSIX
number without evaluating the maximum MSI vectors that ACRN needed for vMSIX
emulation, thus introduce big risk on the device vMSIX table initialization.

If customer has special device that need larger MAX_MSIX_TABLE_NUM to enable
ACRN, he can input the number in his own scenario file.

Tracked-On: #6186

Signed-off-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Victor Sun 2021-06-16 11:34:23 +08:00 committed by wenlingz
parent 0321f6c4bc
commit 9aff6b1fbd
38 changed files with 38 additions and 38 deletions

View File

@ -50,7 +50,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -60,7 +60,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -60,7 +60,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -63,7 +63,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -60,7 +60,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -63,7 +63,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -60,7 +60,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -60,7 +60,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM>96</MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -61,7 +61,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -61,7 +61,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -61,7 +61,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -61,7 +61,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -59,7 +59,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -59,7 +59,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -51,7 +51,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -59,7 +59,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>16</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -55,7 +55,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>128</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -58,7 +58,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>128</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>32</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -54,7 +54,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>128</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>

View File

@ -55,7 +55,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>128</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -55,7 +55,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>128</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -47,7 +47,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>

View File

@ -51,7 +51,7 @@
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>64</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM></MAX_MSIX_TABLE_NUM>
<MAX_MSIX_TABLE_NUM>64</MAX_MSIX_TABLE_NUM>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>