From 9aff6b1fbd861670b25e55207a12a11095ee95aa Mon Sep 17 00:00:00 2001
From: Victor Sun <victor.sun@intel.com>
Date: Wed, 16 Jun 2021 11:34:23 +0800
Subject: [PATCH] config_tools: Revert "update scenario xml" for
 MAX_MSIX_TABLE_NUM

This reverts commit 24af7f8f9d42c0b611cea3c4b2426622f8312535 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>
---
 misc/config_tools/data/adl-rvp/industry.xml                | 2 +-
 misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml           | 2 +-
 misc/config_tools/data/cfl-k700-i7/industry.xml            | 2 +-
 misc/config_tools/data/ehl-crb-b/fusa_partition.xml        | 2 +-
 misc/config_tools/data/ehl-crb-b/hybrid.xml                | 2 +-
 misc/config_tools/data/ehl-crb-b/hybrid_rt.xml             | 2 +-
 misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml        | 2 +-
 misc/config_tools/data/ehl-crb-b/industry.xml              | 2 +-
 misc/config_tools/data/ehl-crb-b/logical_partition.xml     | 2 +-
 misc/config_tools/data/ehl-crb-b/sdc.xml                   | 2 +-
 misc/config_tools/data/generic_board/hybrid.xml            | 2 +-
 misc/config_tools/data/generic_board/hybrid_rt.xml         | 2 +-
 misc/config_tools/data/generic_board/industry.xml          | 2 +-
 misc/config_tools/data/generic_board/logical_partition.xml | 2 +-
 misc/config_tools/data/nuc11tnbi5/hybrid.xml               | 2 +-
 misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml            | 2 +-
 misc/config_tools/data/nuc11tnbi5/industry.xml             | 2 +-
 misc/config_tools/data/nuc11tnbi5/logical_partition.xml    | 2 +-
 misc/config_tools/data/nuc7i7dnb/hybrid.xml                | 2 +-
 misc/config_tools/data/nuc7i7dnb/industry.xml              | 2 +-
 misc/config_tools/data/nuc7i7dnb/logical_partition.xml     | 2 +-
 misc/config_tools/data/nuc7i7dnb/sdc.xml                   | 2 +-
 misc/config_tools/data/qemu/sdc.xml                        | 2 +-
 misc/config_tools/data/tgl-rvp/hybrid.xml                  | 2 +-
 misc/config_tools/data/tgl-rvp/hybrid_rt.xml               | 2 +-
 misc/config_tools/data/tgl-rvp/industry.xml                | 2 +-
 misc/config_tools/data/tgl-rvp/logical_partition.xml       | 2 +-
 misc/config_tools/data/tgl-rvp/sdc.xml                     | 2 +-
 misc/config_tools/data/whl-ipc-i5/hybrid.xml               | 2 +-
 misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml            | 2 +-
 misc/config_tools/data/whl-ipc-i5/industry.xml             | 2 +-
 misc/config_tools/data/whl-ipc-i5/logical_partition.xml    | 2 +-
 misc/config_tools/data/whl-ipc-i5/sdc.xml                  | 2 +-
 misc/config_tools/data/whl-ipc-i7/hybrid.xml               | 2 +-
 misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml            | 2 +-
 misc/config_tools/data/whl-ipc-i7/industry.xml             | 2 +-
 misc/config_tools/data/whl-ipc-i7/logical_partition.xml    | 2 +-
 misc/config_tools/data/whl-ipc-i7/sdc.xml                  | 2 +-
 38 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/misc/config_tools/data/adl-rvp/industry.xml b/misc/config_tools/data/adl-rvp/industry.xml
index b70ca7959..e1df8867f 100755
--- a/misc/config_tools/data/adl-rvp/industry.xml
+++ b/misc/config_tools/data/adl-rvp/industry.xml
@@ -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>
 
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 cc8e72fc0..a4684e6f7 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -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>
 
diff --git a/misc/config_tools/data/cfl-k700-i7/industry.xml b/misc/config_tools/data/cfl-k700-i7/industry.xml
index b4fce031a..1fa3668ba 100644
--- a/misc/config_tools/data/cfl-k700-i7/industry.xml
+++ b/misc/config_tools/data/cfl-k700-i7/industry.xml
@@ -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>
 
diff --git a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
index 9f73e9747..641925cf7 100644
--- a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
@@ -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>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid.xml b/misc/config_tools/data/ehl-crb-b/hybrid.xml
index 00ecef5c4..f65eba8c7 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid.xml
@@ -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>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
index cab433e80..70adac06e 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
@@ -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>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
index 4ba186cc0..416ecafc9 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
@@ -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>
diff --git a/misc/config_tools/data/ehl-crb-b/industry.xml b/misc/config_tools/data/ehl-crb-b/industry.xml
index f7dfed35f..e511c7f66 100644
--- a/misc/config_tools/data/ehl-crb-b/industry.xml
+++ b/misc/config_tools/data/ehl-crb-b/industry.xml
@@ -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>
diff --git a/misc/config_tools/data/ehl-crb-b/logical_partition.xml b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
index 02d71e223..e154d5098 100644
--- a/misc/config_tools/data/ehl-crb-b/logical_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
@@ -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>
diff --git a/misc/config_tools/data/ehl-crb-b/sdc.xml b/misc/config_tools/data/ehl-crb-b/sdc.xml
index 6361a4c60..9c1d7854f 100644
--- a/misc/config_tools/data/ehl-crb-b/sdc.xml
+++ b/misc/config_tools/data/ehl-crb-b/sdc.xml
@@ -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>
diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml
index 01e89f98d..71aeab96a 100644
--- a/misc/config_tools/data/generic_board/hybrid.xml
+++ b/misc/config_tools/data/generic_board/hybrid.xml
@@ -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>
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index 44207a835..a970c9cc1 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -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>
diff --git a/misc/config_tools/data/generic_board/industry.xml b/misc/config_tools/data/generic_board/industry.xml
index 674bc65c7..bdd786ba6 100644
--- a/misc/config_tools/data/generic_board/industry.xml
+++ b/misc/config_tools/data/generic_board/industry.xml
@@ -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>
diff --git a/misc/config_tools/data/generic_board/logical_partition.xml b/misc/config_tools/data/generic_board/logical_partition.xml
index 84e1cb5fb..d969a3cdc 100644
--- a/misc/config_tools/data/generic_board/logical_partition.xml
+++ b/misc/config_tools/data/generic_board/logical_partition.xml
@@ -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>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
index 76f387b84..005087ceb 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
@@ -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>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml
index 41ef90775..ff8c7e57f 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid_rt.xml
@@ -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>
diff --git a/misc/config_tools/data/nuc11tnbi5/industry.xml b/misc/config_tools/data/nuc11tnbi5/industry.xml
index 3bdcaac04..bf8eb854f 100644
--- a/misc/config_tools/data/nuc11tnbi5/industry.xml
+++ b/misc/config_tools/data/nuc11tnbi5/industry.xml
@@ -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>
diff --git a/misc/config_tools/data/nuc11tnbi5/logical_partition.xml b/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
index 4b2a61dc5..72a5a169e 100644
--- a/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
+++ b/misc/config_tools/data/nuc11tnbi5/logical_partition.xml
@@ -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>
diff --git a/misc/config_tools/data/nuc7i7dnb/hybrid.xml b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
index 73f24ca28..4a5ec2bbc 100644
--- a/misc/config_tools/data/nuc7i7dnb/hybrid.xml
+++ b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
@@ -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>
 
diff --git a/misc/config_tools/data/nuc7i7dnb/industry.xml b/misc/config_tools/data/nuc7i7dnb/industry.xml
index 290e27732..0ac89385a 100644
--- a/misc/config_tools/data/nuc7i7dnb/industry.xml
+++ b/misc/config_tools/data/nuc7i7dnb/industry.xml
@@ -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>
 
diff --git a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
index 631cf18d9..1381ab330 100644
--- a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
+++ b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml
@@ -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>
 
diff --git a/misc/config_tools/data/nuc7i7dnb/sdc.xml b/misc/config_tools/data/nuc7i7dnb/sdc.xml
index 1e779b2fa..6ab63c630 100644
--- a/misc/config_tools/data/nuc7i7dnb/sdc.xml
+++ b/misc/config_tools/data/nuc7i7dnb/sdc.xml
@@ -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>
 
diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml
index 0ebff33f8..e5bbe897d 100644
--- a/misc/config_tools/data/qemu/sdc.xml
+++ b/misc/config_tools/data/qemu/sdc.xml
@@ -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>
 
diff --git a/misc/config_tools/data/tgl-rvp/hybrid.xml b/misc/config_tools/data/tgl-rvp/hybrid.xml
index 185620f5b..826c90de4 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid.xml
@@ -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>
 
diff --git a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
index 662aa1aa2..4e8dcf861 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml
@@ -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>
 
diff --git a/misc/config_tools/data/tgl-rvp/industry.xml b/misc/config_tools/data/tgl-rvp/industry.xml
index ba1c66ce9..ee12bb96a 100644
--- a/misc/config_tools/data/tgl-rvp/industry.xml
+++ b/misc/config_tools/data/tgl-rvp/industry.xml
@@ -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>
diff --git a/misc/config_tools/data/tgl-rvp/logical_partition.xml b/misc/config_tools/data/tgl-rvp/logical_partition.xml
index b59d8fe93..b3ea07926 100644
--- a/misc/config_tools/data/tgl-rvp/logical_partition.xml
+++ b/misc/config_tools/data/tgl-rvp/logical_partition.xml
@@ -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>
 
diff --git a/misc/config_tools/data/tgl-rvp/sdc.xml b/misc/config_tools/data/tgl-rvp/sdc.xml
index 2eee3675c..b9c105ee8 100644
--- a/misc/config_tools/data/tgl-rvp/sdc.xml
+++ b/misc/config_tools/data/tgl-rvp/sdc.xml
@@ -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>
 
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 67b74798b..ed5775df1 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -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>
 
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 e0fc2c704..c3231bb76 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
@@ -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>
 
diff --git a/misc/config_tools/data/whl-ipc-i5/industry.xml b/misc/config_tools/data/whl-ipc-i5/industry.xml
index 052c73bf3..ab25a9c69 100644
--- a/misc/config_tools/data/whl-ipc-i5/industry.xml
+++ b/misc/config_tools/data/whl-ipc-i5/industry.xml
@@ -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>
 
diff --git a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
index ec075a09c..4ca0cab15 100644
--- a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
+++ b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml
@@ -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>
 
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml
index 76af96a50..4b06ba7f6 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml
@@ -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>
 
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid.xml b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
index 8edff603f..5503c2460 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
@@ -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>
 
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
index 080db08b6..dad0d7643 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
@@ -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>
 
diff --git a/misc/config_tools/data/whl-ipc-i7/industry.xml b/misc/config_tools/data/whl-ipc-i7/industry.xml
index f20e1a6ec..d7214fc48 100644
--- a/misc/config_tools/data/whl-ipc-i7/industry.xml
+++ b/misc/config_tools/data/whl-ipc-i7/industry.xml
@@ -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>
 
diff --git a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
index 4a1f6fdfe..725287bd3 100644
--- a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
+++ b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml
@@ -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>
 
diff --git a/misc/config_tools/data/whl-ipc-i7/sdc.xml b/misc/config_tools/data/whl-ipc-i7/sdc.xml
index 512a8b267..1f7065c5a 100644
--- a/misc/config_tools/data/whl-ipc-i7/sdc.xml
+++ b/misc/config_tools/data/whl-ipc-i7/sdc.xml
@@ -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>