From 37ec7ab62f4d571f44d00d6c41db445342a744ea Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Mon, 12 Oct 2020 07:55:44 -0600
Subject: [PATCH] UefiPayloadPkg: Fix TPM1.2 detection

Check the actual TPM1.2 command response to prevent a false positive
when talking to a TPM2.0.

Tested using a ST33TPHF TPM 2.0.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
---
 UefiPayloadPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UefiPayloadPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/UefiPayloadPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
index b919f8cf97..207d967049 100644
--- a/UefiPayloadPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
+++ b/UefiPayloadPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
@@ -62,6 +62,12 @@ TestTpm12 (
     return Status;
   }
 
+  if ((SwapBytes16(Response.Hdr.tag) != TPM_TAG_RSP_COMMAND) ||
+      (SwapBytes32(Response.Hdr.returnCode) != TPM_SUCCESS)) {
+    DEBUG ((EFI_D_INFO, "TestTpm12: Response Code error! 0x%08x\r\n", SwapBytes32(Response.Hdr.returnCode)));
+    return EFI_DEVICE_ERROR;
+  }
+
   return EFI_SUCCESS;
 }