Add performance optimization for Tcg/TrEE.

[mirror_edk2.git] / SecurityPkg / Tcg / TcgPei / TcgPei.c

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index dcf4b0bbbd62b21279e8fc2c8604b3506cbb535f..419eacf37d2ab29aefc7b8f8176a74f82579f9f4 100644 (file)
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c
@@ -50,6 +50,12 @@ EFI_PEI_PPI_DESCRIPTOR  mTpmInitializedPpiList = {
   NULL\r
 };\r
 \r
+EFI_PEI_PPI_DESCRIPTOR  mTpmInitializationDonePpiList = {\r
+  EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
+  &gPeiTpmInitializationDonePpiGuid,\r
+  NULL\r
+};\r
+\r
 EFI_PLATFORM_FIRMWARE_BLOB *mMeasuredBaseFvInfo;\r
 UINT32 mMeasuredBaseFvIndex = 0;\r
 \r
@@ -737,6 +743,7 @@ PeimEntryMA (
   )\r
 {\r
   EFI_STATUS                        Status;\r
+  EFI_STATUS                        Status2;\r
   EFI_BOOT_MODE                     BootMode;\r
   TIS_TPM_HANDLE                    TpmHandle;\r
 \r
@@ -745,6 +752,11 @@ PeimEntryMA (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
+  if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {\r
+    DEBUG ((EFI_D_ERROR, "TPM error!\n"));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
   //\r
   // Initialize TPM device\r
   //\r
@@ -768,13 +780,13 @@ PeimEntryMA (
     Status = TisPcRequestUseTpm ((TIS_PC_REGISTERS_PTR)TpmHandle);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "TPM not detected!\n"));\r
-      return Status;\r
+      goto Done;\r
     }\r
 \r
     if (PcdGet8 (PcdTpmInitializationPolicy) == 1) {\r
       Status = TpmCommStartup ((EFI_PEI_SERVICES**)PeiServices, TpmHandle, BootMode);\r
       if (EFI_ERROR (Status) ) {\r
-        return Status;\r
+        goto Done;\r
       }\r
     }\r
 \r
@@ -784,20 +796,37 @@ PeimEntryMA (
     if (BootMode != BOOT_ON_S3_RESUME) {\r
       Status = TpmCommContinueSelfTest ((EFI_PEI_SERVICES**)PeiServices, TpmHandle);\r
       if (EFI_ERROR (Status)) {\r
-        return Status;\r
+        goto Done;\r
       }\r
     }\r
 \r
+    //\r
+    // Only intall TpmInitializedPpi on success\r
+    //\r
     Status = PeiServicesInstallPpi (&mTpmInitializedPpiList);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
   if (mImageInMemory) {\r
     Status = PeimEntryMP ((EFI_PEI_SERVICES**)PeiServices);\r
-    if (EFI_ERROR (Status)) {\r
-      return Status;\r
-    }\r
+    return Status;\r
   }\r
 \r
+Done:\r
+  if (EFI_ERROR (Status)) {\r
+    DEBUG ((EFI_D_ERROR, "TPM error! Build Hob\n"));\r
+    BuildGuidHob (&gTpmErrorHobGuid,0);\r
+    REPORT_STATUS_CODE (\r
+      EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+      (PcdGet32 (PcdStatusCodeSubClassTpmDevice) | EFI_P_EC_INTERFACE_ERROR)\r
+      );\r
+  }\r
+  //\r
+  // Always intall TpmInitializationDonePpi no matter success or fail.\r
+  // Other driver can know TPM initialization state by TpmInitializedPpi.\r
+  //\r
+  Status2 = PeiServicesInstallPpi (&mTpmInitializationDonePpiList);\r
+  ASSERT_EFI_ERROR (Status2);\r
+\r
   return Status;\r
 }\r