From 3cf525725cab7ebca8a3591f3e0747414118f457 Mon Sep 17 00:00:00 2001
From: "Yang,Yu-chu" <yu-chu.yang@intel.com>
Date: Mon, 13 Sep 2021 15:55:00 -0700
Subject: [PATCH] config-tools: remove acrn:is-tpm-passthrough-board

Simplify the statement by TPM2 enablement detection and present TPM2 device.
Remove the function and move the statement to misc_cfg.h.xsl

Tracked-On: #6562
Signed-off-by: Yang,Yu-chu <yu-chu.yang@intel.com>
---
 misc/config_tools/xforms/lib.xsl        | 23 -----------------------
 misc/config_tools/xforms/misc_cfg.h.xsl | 20 +++++++++-----------
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/misc/config_tools/xforms/lib.xsl b/misc/config_tools/xforms/lib.xsl
index 66b5f3dfc..1597cc54b 100644
--- a/misc/config_tools/xforms/lib.xsl
+++ b/misc/config_tools/xforms/lib.xsl
@@ -481,29 +481,6 @@
     </xsl:choose>
   </func:function>
 
-  <func:function name="acrn:is-tpm-passthrough-board">
-    <xsl:choose>
-      <xsl:when test="//@board = 'whl-ipc-i5'">
-        <func:result select="true()" />
-      </xsl:when>
-      <xsl:when test="//@board = 'whl-ipc-i7'">
-        <func:result select="true()" />
-      </xsl:when>
-      <xsl:when test="//@board = 'tgl-rvp'">
-        <func:result select="true()" />
-      </xsl:when>
-      <xsl:when test="//@board = 'ehl-crb-b'">
-        <func:result select="true()" />
-      </xsl:when>
-      <xsl:when test="//@board = 'cfl-k700-i7'">
-        <func:result select="true()" />
-      </xsl:when>
-      <xsl:otherwise>
-        <func:result select="false()" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </func:function>
-
   <!-- acrn:is-vmsix-supported-device checks the given params are matched with any of the listed devices -->
   <!-- The listed devices are known that can have a virtual vmsix -->
   <!-- Each pair of vendor and identifier represents a device which can have a vmsix (virtual msix) -->
diff --git a/misc/config_tools/xforms/misc_cfg.h.xsl b/misc/config_tools/xforms/misc_cfg.h.xsl
index 02a48746e..98e373039 100644
--- a/misc/config_tools/xforms/misc_cfg.h.xsl
+++ b/misc/config_tools/xforms/misc_cfg.h.xsl
@@ -202,17 +202,15 @@
 
 <xsl:template name="vm0_passthrough_tpm">
   <xsl:if test="acrn:is-pre-launched-vm(vm[@id = 0]/vm_type)">
-    <xsl:if test="acrn:is-tpm-passthrough-board()">
-      <xsl:if test="vm[@id = 0]/mmio_resources/TPM2 = 'y'">
-        <xsl:value-of select="acrn:define('VM0_PASSTHROUGH_TPM', '', '')" />
-        <xsl:value-of select="acrn:define('VM0_TPM_BUFFER_BASE_ADDR', '0xFED40000', 'UL')" />
-        <xsl:value-of select="acrn:define('VM0_TPM_BUFFER_BASE_ADDR_GPA', '0xFED40000', 'UL')" />
-        <xsl:value-of select="acrn:define('VM0_TPM_BUFFER_SIZE', '0x5000', 'UL')" />
-        <xsl:if test="//capability[@id='log_area']">
-          <xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_BASE_ADDR', //allocation-data/acrn-config/vm[@id = '0']/log_area_start_address, 'UL')" />
-          <xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_BASE_ADDR_HPA', //capability[@id='log_area']/log_area_start_address, 'UL')" />
-          <xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_SIZE', //allocation-data/acrn-config/vm[@id = '0']/log_area_minimum_length, 'UL')" />
-        </xsl:if>
+    <xsl:if test="//vm/mmio_resources/TPM2/text() = 'y' and //device[@id = 'MSFT0101' or compatible_id = 'MSFT0101']">
+      <xsl:value-of select="acrn:define('VM0_PASSTHROUGH_TPM', '', '')" />
+      <xsl:value-of select="acrn:define('VM0_TPM_BUFFER_BASE_ADDR', '0xFED40000', 'UL')" />
+      <xsl:value-of select="acrn:define('VM0_TPM_BUFFER_BASE_ADDR_GPA', '0xFED40000', 'UL')" />
+      <xsl:value-of select="acrn:define('VM0_TPM_BUFFER_SIZE', '0x5000', 'UL')" />
+      <xsl:if test="//capability[@id='log_area']">
+        <xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_BASE_ADDR', //allocation-data/acrn-config/vm[@id = '0']/log_area_start_address, 'UL')" />
+        <xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_BASE_ADDR_HPA', //capability[@id='log_area']/log_area_start_address, 'UL')" />
+        <xsl:value-of select="acrn:define('VM0_TPM_EVENTLOG_SIZE', //allocation-data/acrn-config/vm[@id = '0']/log_area_minimum_length, 'UL')" />
       </xsl:if>
     </xsl:if>
   </xsl:if>