WT

Signed-off-by: Sergii Dmytruk <[email protected]>
Dasharo · Jul 4, 2024 · 9af3e30 · 9af3e30
1 parent 0444e65
commit 9af3e30
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/DasharoPayloadPkg/DasharoPayloadPkg.dsc b/DasharoPayloadPkg/DasharoPayloadPkg.dsc
@@ -875,6 +875,10 @@
       NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
+#  SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf {
+#    <LibraryClasses>
+#      MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf
+#  }
   SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {
     <LibraryClasses>
       Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf

diff --git a/DasharoPayloadPkg/DasharoPayloadPkg.fdf b/DasharoPayloadPkg/DasharoPayloadPkg.fdf
@@ -326,6 +326,7 @@ INF SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
 INF  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
 INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
 INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
+#INF  SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf
 !if $(OPAL_PASSWORD_ENABLE) == TRUE
 INF SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordDxe.inf
 !endif

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -2861,10 +2861,10 @@ BmEnumeratePreInstalledBootOptions (
       FreePool(DevPathStr);
 
     /* Skip non-ESP */
-    if (!IsEfiSysPartition(Handles[Index])) {
-      DEBUG ((EFI_D_INFO, "%a: Skipping, not an ESP\n", __FUNCTION__));
-      continue;
-    }
+    /* if (!IsEfiSysPartition(Handles[Index])) { */
+    /*   DEBUG ((EFI_D_INFO, "%a: Skipping, not an ESP\n", __FUNCTION__)); */
+    /*   continue; */
+    /* } */
 
     //
     // Skip the removable media, except if DTS.
@@ -2884,9 +2884,10 @@ BmEnumeratePreInstalledBootOptions (
                     &gEfiBlockIoProtocolGuid,
                     (VOID **) &BlkIo
                     );
+
     if (!EFI_ERROR (Status) && BlkIo->Media->RemovableMedia) {
       DEBUG ((EFI_D_INFO, "%a: Skipping, media removable\n", __FUNCTION__));
-      continue;
+      /* continue; */
     }
 
     // Custom boot managers first

diff --git a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c
@@ -801,7 +801,7 @@ PublishTpm2 (
     );
 
   mTpm2AcpiTemplate.Header.Revision = PcdGet8 (PcdTpm2AcpiTableRev);
-  DEBUG ((DEBUG_INFO, "Tpm2 ACPI table revision is %d\n", mTpm2AcpiTemplate.Header.Revision));
+  DEBUG ((DEBUG_ERROR, "Tpm2 ACPI table revision is %d\n", mTpm2AcpiTemplate.Header.Revision));
 
   //
   // PlatformClass is only valid for version 4 and above
@@ -810,7 +810,7 @@ PublishTpm2 (
   //
   if (mTpm2AcpiTemplate.Header.Revision >= EFI_TPM2_ACPI_TABLE_REVISION_4) {
     mTpm2AcpiTemplate.Flags = (mTpm2AcpiTemplate.Flags & 0xFFFF0000) | PcdGet8 (PcdTpmPlatformClass);
-    DEBUG ((DEBUG_INFO, "Tpm2 ACPI table PlatformClass is %d\n", (mTpm2AcpiTemplate.Flags & 0x0000FFFF)));
+    DEBUG ((DEBUG_ERROR, "Tpm2 ACPI table PlatformClass is %d\n", (mTpm2AcpiTemplate.Flags & 0x0000FFFF)));
   }
 
   mTpm2AcpiTemplate.Laml = PcdGet32 (PcdTpm2AcpiTableLaml);
@@ -863,6 +863,7 @@ PublishTpm2 (
                         &TableKey
                         );
   ASSERT_EFI_ERROR (Status);
+  DEBUG ((DEBUG_ERROR, "Tpm2 ACPI table installed: %r\n", Status));
 
   return Status;
 }
@@ -894,6 +895,7 @@ InitializeTcgAcpi (
     return EFI_UNSUPPORTED;
   }
 
+  DEBUG ((DEBUG_ERROR, "TPM2 DTPM instance required!\n"));
   Status = PublishAcpiTable ();
   ASSERT_EFI_ERROR (Status);