From 654e5958cd4a6b08439c470bc4e440fff37ff425 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Tue, 2 Feb 2021 19:17:03 +0100
Subject: [PATCH] Fix TPM detection

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
---
 UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c b/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c
index 8dc30e1d99..abca792c09 100644
--- a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c
+++ b/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.c
@@ -143,23 +143,23 @@ BlDxeEntryPoint (
     Status = PcdSet64S (PcdPciExpressBaseSize, AcpiBoardInfo->PcieBaseSize);
     ASSERT_EFI_ERROR (Status);
 
-    if (AcpiBoardInfo->TPM12Present)
-    {
-      Size = sizeof (gEfiTpmDeviceInstanceTpm12Guid);
-      Status = PcdSetPtrS (
-               PcdTpmInstanceGuid,
-               &Size,
-               &gEfiTpmDeviceInstanceTpm12Guid
-               );
-      ASSERT_EFI_ERROR (Status);
-    }
-    else if (AcpiBoardInfo->TPM20Present)
+    if (AcpiBoardInfo->TPM20Present)
     {
       Size = sizeof (gEfiTpmDeviceInstanceTpm20DtpmGuid);
+      Status = PcdSetPtrS (
+               PcdTpmInstanceGuid,
+               &Size,
+               &gEfiTpmDeviceInstanceTpm20DtpmGuid
+               );
+      ASSERT_EFI_ERROR (Status);
+    }
+    else if (AcpiBoardInfo->TPM12Present)
+    {
+      Size = sizeof (gEfiTpmDeviceInstanceTpm12Guid);
       Status = PcdSetPtrS (
                  PcdTpmInstanceGuid,
                  &Size,
-                 &gEfiTpmDeviceInstanceTpm20DtpmGuid
+                 &gEfiTpmDeviceInstanceTpm12Guid
                  );
       ASSERT_EFI_ERROR (Status);
     }