Add TpmInitializationDonePpi to TPM PEI module.

[mirror_edk2.git] / SecurityPkg / Tcg / TrEEConfig / TrEEConfigPeim.c

diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
index 9c1e917ab41bc669bae43f542f370d3d0fe2822e..efe40bc3ce256d7b872325ec22fabc4b1328a73b 100644 (file)
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
@@ -1,7 +1,7 @@
 /** @file\r
   The module entry point for TrEE configuration module.\r
 \r
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -25,6 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PcdLib.h>\r
 \r
 #include <Ppi/ReadOnlyVariable2.h>\r
+#include <Ppi/TpmInitialized.h>\r
 #include <Protocol/TrEEProtocol.h>\r
 \r
 #include "TrEEConfigNvData.h"\r
@@ -37,6 +38,12 @@ CONST EFI_PEI_PPI_DESCRIPTOR gTpmSelectedPpi = {
   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
 /**\r
   This routine check both SetupVariable and real TPM device, and return final TpmDevice configuration.\r
 \r
@@ -67,6 +74,7 @@ TrEEConfigPeimEntryPoint (
 {\r
   UINTN                           Size;\r
   EFI_STATUS                      Status;\r
+  EFI_STATUS                      Status2;\r
   EFI_PEI_READ_ONLY_VARIABLE2_PPI *VariablePpi;\r
   TREE_CONFIGURATION              TrEEConfiguration;\r
   UINTN                           Index;\r
@@ -101,11 +109,11 @@ TrEEConfigPeimEntryPoint (
   //\r
   // Although we have SetupVariable info, we still need detect TPM device manually.\r
   //\r
-  DEBUG ((EFI_D_ERROR, "TrEEConfiguration.TpmDevice from Setup: %x\n", TrEEConfiguration.TpmDevice));\r
+  DEBUG ((EFI_D_INFO, "TrEEConfiguration.TpmDevice from Setup: %x\n", TrEEConfiguration.TpmDevice));\r
 \r
   if (PcdGetBool (PcdTpmAutoDetection)) {\r
     TpmDevice = DetectTpmDevice (TrEEConfiguration.TpmDevice);\r
-    DEBUG ((EFI_D_ERROR, "TpmDevice final: %x\n", TpmDevice));\r
+    DEBUG ((EFI_D_INFO, "TpmDevice final: %x\n", TpmDevice));\r
     if (TpmDevice != TPM_DEVICE_NULL) {\r
       TrEEConfiguration.TpmDevice = TpmDevice;\r
     }\r
@@ -125,7 +133,7 @@ TrEEConfigPeimEntryPoint (
     if (TpmDevice == mTpmInstanceId[Index].TpmDevice) {\r
       Size = sizeof(mTpmInstanceId[Index].TpmInstanceGuid);\r
       PcdSetPtr (PcdTpmInstanceGuid, &Size, &mTpmInstanceId[Index].TpmInstanceGuid);\r
-      DEBUG ((EFI_D_ERROR, "TpmDevice PCD: %g\n", &mTpmInstanceId[Index].TpmInstanceGuid));\r
+      DEBUG ((EFI_D_INFO, "TpmDevice PCD: %g\n", &mTpmInstanceId[Index].TpmInstanceGuid));\r
       break;\r
     }\r
   }\r
@@ -136,5 +144,15 @@ TrEEConfigPeimEntryPoint (
   Status = PeiServicesInstallPpi (&gTpmSelectedPpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
+  //\r
+  // Even if no TPM is selected or detected, we still need intall TpmInitializationDonePpi.\r
+  // Because TcgPei or TrEEPei will not run, but we still need a way to notify other driver.\r
+  // Other driver can know TPM initialization state by TpmInitializedPpi.\r
+  //\r
+  if (CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceNoneGuid)) {\r
+    Status2 = PeiServicesInstallPpi (&mTpmInitializationDonePpiList);\r
+    ASSERT_EFI_ERROR (Status2);\r
+  }\r
+\r
   return Status;\r
 }\r