From 9b52d75262a34e4ff862ecb0102169b9eeeddf67 Mon Sep 17 00:00:00 2001
From: "Yang,Yu-chu" <yu-chu.yang@intel.com>
Date: Mon, 9 Aug 2021 13:18:31 -0700
Subject: [PATCH] config-tools: refine MAX_MSIX_TABLE_NUM

If the MAX_MSIX_TABLE_NUM is specified in scenario.xml. Return the
largest number from count of MSI, table_size of MSIX or
MAX_MSIX_TABLE_NUM of scenario.xml.

Tracked-On: #6235
Signed-off-by: Yang,Yu-chu <yu-chu.yang@intel.com>
---
 misc/config_tools/xforms/config.h.xsl      |  4 +++-
 misc/config_tools/xforms/config.mk.xsl     |  4 +++-
 misc/config_tools/xforms/config_common.xsl | 19 ++++++++++++++-----
 misc/config_tools/xforms/lib.xsl           | 13 +++++++++++++
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/misc/config_tools/xforms/config.h.xsl b/misc/config_tools/xforms/config.h.xsl
index eff2ee96a..e4cd0cca5 100644
--- a/misc/config_tools/xforms/config.h.xsl
+++ b/misc/config_tools/xforms/config.h.xsl
@@ -6,7 +6,9 @@
 <xsl:stylesheet
     version="1.0"
     xmlns:xi="http://www.w3.org/2003/XInclude"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:acrn="http://projectacrn.org">
+  <xsl:include href="lib.xsl" />
   <xsl:output method="text" />
 
   <xsl:variable name="integer-suffix" select="'U'" />
diff --git a/misc/config_tools/xforms/config.mk.xsl b/misc/config_tools/xforms/config.mk.xsl
index 8b88da702..6ebf6e80c 100644
--- a/misc/config_tools/xforms/config.mk.xsl
+++ b/misc/config_tools/xforms/config.mk.xsl
@@ -6,7 +6,9 @@
 <xsl:stylesheet
     version="1.0"
     xmlns:xi="http://www.w3.org/2003/XInclude"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:acrn="http://projectacrn.org">
+  <xsl:include href="lib.xsl" />
   <xsl:output method="text" />
 
   <xsl:variable name="integer-suffix" select="''" />
diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl
index 2bdb3c352..13aa869a1 100644
--- a/misc/config_tools/xforms/config_common.xsl
+++ b/misc/config_tools/xforms/config_common.xsl
@@ -262,11 +262,20 @@
         <xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
       </xsl:for-each>
     </xsl:variable>
-    <xsl:call-template name="integer-by-key-value">
-      <xsl:with-param name="key" select="'MAX_MSIX_TABLE_NUM'" />
-      <xsl:with-param name="value" select="$max" />
-      <xsl:with-param name="default" select="'64'" />
-    </xsl:call-template>
+    <xsl:choose>
+      <xsl:when test="//CAPACITIES/MAX_MSIX_TABLE_NUM/text()">
+        <xsl:call-template name="integer-by-key-value">
+          <xsl:with-param name="key" select="'MAX_MSIX_TABLE_NUM'" />
+          <xsl:with-param name="value" select="acrn:max($max, //CAPACITIES/MAX_MSIX_TABLE_NUM)" />
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="integer-by-key-value">
+          <xsl:with-param name="key" select="'MAX_MSIX_TABLE_NUM'" />
+          <xsl:with-param name="value" select="$max" />
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <xsl:template name="hex-to-bin">
diff --git a/misc/config_tools/xforms/lib.xsl b/misc/config_tools/xforms/lib.xsl
index ce51b9ef2..11df21b21 100644
--- a/misc/config_tools/xforms/lib.xsl
+++ b/misc/config_tools/xforms/lib.xsl
@@ -130,6 +130,19 @@
     </xsl:choose>
   </func:function>
 
+  <func:function name="acrn:max">
+    <xsl:param name="a" />
+    <xsl:param name="b" />
+    <xsl:choose>
+      <xsl:when test="$a &gt; $b">
+        <func:result select="$a" />
+      </xsl:when>
+      <xsl:otherwise>
+        <func:result select="$b" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </func:function>
+
   <func:function name="acrn:find-list-min">
     <xsl:param name="list" />
     <xsl:param name="delimar" />