Add TpmInitializationDonePpi to TPM PEI module.

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

diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c b/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
index eea40847c5e648299fe5a27c9ed0d26afa4a5a20..a7bc903436976bc36544db601777d0a57a659447 100644 (file)
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
+++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
@@ -62,6 +62,12 @@ EFI_PEI_PPI_DESCRIPTOR  mTpmInitializedPpiList = {
   NULL\r
 };\r
 \r
   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
 EFI_PLATFORM_FIRMWARE_BLOB *mMeasuredBaseFvInfo;\r
 UINT32 mMeasuredBaseFvIndex = 0;\r
 \r


@@ -621,6 +627,7 @@ PeimEntryMA (
   )\r
 {\r
   EFI_STATUS                        Status;\r
   )\r
 {\r
   EFI_STATUS                        Status;\r

+  EFI_STATUS                        Status2;\r

   EFI_BOOT_MODE                     BootMode;\r
 \r
   if (CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceNoneGuid) ||\r
   EFI_BOOT_MODE                     BootMode;\r
 \r
   if (CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceNoneGuid) ||\r


@@ -629,15 +636,6 @@ PeimEntryMA (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

-  //\r
-  // Update for Performance optimization\r
-  //\r
-  Status = Tpm2RequestUseTpm ();\r
-  if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "TPM not detected!\n"));\r
-    return Status;\r
-  }\r
-\r

   Status = PeiServicesGetBootMode (&BootMode);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = PeiServicesGetBootMode (&BootMode);\r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -658,6 +656,12 @@ PeimEntryMA (
     //\r
     // Initialize TPM device\r
     //\r
     //\r
     // Initialize TPM device\r
     //\r

+    Status = Tpm2RequestUseTpm ();\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((DEBUG_ERROR, "TPM2 not detected!\n"));\r
+      goto Done;\r
+    }\r
+\r

     if (PcdGet8 (PcdTpm2InitializationPolicy) == 1) {\r
       if (BootMode == BOOT_ON_S3_RESUME) {\r
         Status = Tpm2Startup (TPM_SU_STATE);\r
     if (PcdGet8 (PcdTpm2InitializationPolicy) == 1) {\r
       if (BootMode == BOOT_ON_S3_RESUME) {\r
         Status = Tpm2Startup (TPM_SU_STATE);\r


@@ -668,7 +672,7 @@ PeimEntryMA (
         Status = Tpm2Startup (TPM_SU_CLEAR);\r
       }\r
       if (EFI_ERROR (Status) ) {\r
         Status = Tpm2Startup (TPM_SU_CLEAR);\r
       }\r
       if (EFI_ERROR (Status) ) {\r

-        return Status;\r
+        goto Done;\r

       }\r
     }\r
 \r
       }\r
     }\r
 \r


@@ -679,21 +683,30 @@ PeimEntryMA (
       if (PcdGet8 (PcdTpm2SelfTestPolicy) == 1) {\r
         Status = Tpm2SelfTest (NO);\r
         if (EFI_ERROR (Status)) {\r
       if (PcdGet8 (PcdTpm2SelfTestPolicy) == 1) {\r
         Status = Tpm2SelfTest (NO);\r
         if (EFI_ERROR (Status)) {\r

-          return Status;\r
+          goto Done;\r

         }\r
       }\r
     }\r
 \r
         }\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
     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
   }\r
 \r

+Done:\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
   return Status;\r
 }\r