Add TpmInitializationDonePpi to TPM PEI module.

This PPI will always be installed to notify other drivers that TPM initialization action is done. TPM initialization may success or fail, or even not present.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <jiewen.yao@intel.com>
Reviewed-by: "Dong, Guo" <guo.dong@intel.com>
Reviewed-by: "Chiu, Chasel" <chasel.chiu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16638 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SecurityPkg/Include/Ppi/TpmInitialized.h b/SecurityPkg/Include/Ppi/TpmInitialized.h
index dbbd41598988e0ae3197672b7eaf418777d4ff79..7d458f5e1284b76c5adfe32da4708e29f2d86c57 100644 (file)
--- a/SecurityPkg/Include/Ppi/TpmInitialized.h
+++ b/SecurityPkg/Include/Ppi/TpmInitialized.h
@@ -3,7 +3,7 @@
   initialized.  PEIMs that must execute after TPM hardware initialization\r
   may use this GUID in their dependency expressions.\r
     \r
   initialized.  PEIMs that must execute after TPM hardware initialization\r
   may use this GUID in their dependency expressions.\r
     \r

-Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2008 - 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
 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


@@ -27,4 +27,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 extern EFI_GUID gPeiTpmInitializedPpiGuid;\r
 \r
 \r
 extern EFI_GUID gPeiTpmInitializedPpiGuid;\r
 \r

+///\r
+/// Global ID for the PEI_TPM_INITIALIZATION_DONE_PPI which always uses a NULL interface. \r
+///\r
+#define PEI_TPM_INITIALIZATION_DONE_PPI_GUID \\r
+  { \\r
+    0xa030d115, 0x54dd, 0x447b, { 0x90, 0x64, 0xf2, 0x6, 0x88, 0x3d, 0x7c, 0xcc \\r
+  }\r
+\r
+extern EFI_GUID gPeiTpmInitializationDonePpiGuid;\r
+\r

 #endif\r
 #endif\r

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index c3e894f4ecf516c0ca82ac5023398943cd187804..b15cd624010337744757dd6d959c8fc0a2312e1a 100644 (file)
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -181,6 +181,10 @@
   # Include/Ppi/TpmInitialized.h\r
   gPeiTpmInitializedPpiGuid      = { 0xe9db0d58, 0xd48d, 0x47f6, { 0x9c, 0x6e, 0x6f, 0x40, 0xe8, 0x6c, 0x7b, 0x41 }}\r
 \r
   # Include/Ppi/TpmInitialized.h\r
   gPeiTpmInitializedPpiGuid      = { 0xe9db0d58, 0xd48d, 0x47f6, { 0x9c, 0x6e, 0x6f, 0x40, 0xe8, 0x6c, 0x7b, 0x41 }}\r
 \r

+  ## The PPI GUID for that TPM initialization is done. TPM initialization may be success or fail.\r
+  # Include/Ppi/TpmInitialized.h\r
+  gPeiTpmInitializationDonePpiGuid = { 0xa030d115, 0x54dd, 0x447b, { 0x90, 0x64, 0xf2, 0x6, 0x88, 0x3d, 0x7c, 0xcc }}\r
+\r

   ## Include/Ppi/FirmwareVolumeInfoMeasurementExcluded.h\r
   gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid = { 0x6e056ff9, 0xc695, 0x4364, { 0x9e, 0x2c, 0x61, 0x26, 0xf5, 0xce, 0xea, 0xae } }\r
 \r
   ## Include/Ppi/FirmwareVolumeInfoMeasurementExcluded.h\r
   gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid = { 0x6e056ff9, 0xc695, 0x4364, { 0x9e, 0x2c, 0x61, 0x26, 0xf5, 0xce, 0xea, 0xae } }\r
 \r

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index dcf4b0bbbd62b21279e8fc2c8604b3506cbb535f..466caf66c21282426c37cb83dfd6eabe298144b4 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
   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


@@ -737,6 +743,7 @@ PeimEntryMA (
   )\r
 {\r
   EFI_STATUS                        Status;\r
   )\r
 {\r
   EFI_STATUS                        Status;\r

+  EFI_STATUS                        Status2;\r

   EFI_BOOT_MODE                     BootMode;\r
   TIS_TPM_HANDLE                    TpmHandle;\r
 \r
   EFI_BOOT_MODE                     BootMode;\r
   TIS_TPM_HANDLE                    TpmHandle;\r
 \r


@@ -768,13 +775,13 @@ PeimEntryMA (
     Status = TisPcRequestUseTpm ((TIS_PC_REGISTERS_PTR)TpmHandle);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "TPM not detected!\n"));\r
     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
     }\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
       }\r
     }\r
 \r


@@ -784,20 +791,29 @@ PeimEntryMA (
     if (BootMode != BOOT_ON_S3_RESUME) {\r
       Status = TpmCommContinueSelfTest ((EFI_PEI_SERVICES**)PeiServices, TpmHandle);\r
       if (EFI_ERROR (Status)) {\r
     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
     }\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

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index 6a76cf1c2e349ca06d1db28f94b69b98f9332ce0..56f87c2e1b19bc9f8b5e9c66c15f7ac9c1c8b14d 100644 (file)
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
@@ -69,7 +69,8 @@
   gEfiPeiFirmwareVolumeInfoPpiGuid                                    ## SOMETIMES_CONSUMES     ## NOTIFY\r
   gEfiPeiFirmwareVolumeInfo2PpiGuid                                   ## SOMETIMES_CONSUMES     ## NOTIFY\r
   gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid                 ## SOMETIMES_CONSUMES\r
   gEfiPeiFirmwareVolumeInfoPpiGuid                                    ## SOMETIMES_CONSUMES     ## NOTIFY\r
   gEfiPeiFirmwareVolumeInfo2PpiGuid                                   ## SOMETIMES_CONSUMES     ## NOTIFY\r
   gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid                 ## SOMETIMES_CONSUMES\r

-  gPeiTpmInitializedPpiGuid                                           ## PRODUCES\r
+  gPeiTpmInitializedPpiGuid                                           ## SOMETIMES_PRODUCES\r
+  gPeiTpmInitializationDonePpiGuid                                    ## PRODUCES\r

   gEfiEndOfPeiSignalPpiGuid                                           ## SOMETIMES_CONSUMES     ## NOTIFY\r
 \r
 [Pcd]\r
   gEfiEndOfPeiSignalPpiGuid                                           ## SOMETIMES_CONSUMES     ## NOTIFY\r
 \r
 [Pcd]\r

diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
index 31807cb06eff56238d636a052ab997f081909629..e8de529f8bee4f08e25f3df30f7d3e3aba4a19cb 100644 (file)
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
@@ -4,7 +4,7 @@
 #  This module initializes TPM device type based on variable and detection.\r
 #  NOTE: This module is only for reference only, each platform should have its own setup page.\r
 #\r
 #  This module initializes TPM device type based on variable and detection.\r
 #  NOTE: This module is only for reference only, each platform should have its own setup page.\r
 #\r

-# Copyright (c) 2013 - 2014, 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
 # 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


@@ -58,9 +58,11 @@
   ## SOMETIMES_CONSUMES ## Variable:L"TREE_DEVICE_DETECTION"\r
   gTrEEConfigFormSetGuid\r
   gEfiTpmDeviceSelectedGuid           ## PRODUCES             ## GUID    # Used as a PPI GUID\r
   ## SOMETIMES_CONSUMES ## Variable:L"TREE_DEVICE_DETECTION"\r
   gTrEEConfigFormSetGuid\r
   gEfiTpmDeviceSelectedGuid           ## PRODUCES             ## GUID    # Used as a PPI GUID\r

+  gEfiTpmDeviceInstanceNoneGuid       ## SOMETIMES_CONSUMES   ## GUID    # TPM device identifier\r

 \r
 [Ppis]\r
   gEfiPeiReadOnlyVariable2PpiGuid     ## CONSUMES\r
 \r
 [Ppis]\r
   gEfiPeiReadOnlyVariable2PpiGuid     ## CONSUMES\r

+  gPeiTpmInitializationDonePpiGuid    ## SOMETIMES_PRODUCES\r

 \r
 [Pcd]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                 ## PRODUCES\r
 \r
 [Pcd]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                 ## PRODUCES\r

diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
index 579d096be5e2d97caf9af28b85c12040bcdbea88..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
 /** @file\r
   The module entry point for TrEE configuration module.\r
 \r

-Copyright (c) 2013 - 2014, 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
 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 <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
 #include <Protocol/TrEEProtocol.h>\r
 \r
 #include "TrEEConfigNvData.h"\r


@@ -37,6 +38,12 @@ CONST EFI_PEI_PPI_DESCRIPTOR gTpmSelectedPpi = {
   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

 /**\r
   This routine check both SetupVariable and real TPM device, and return final TpmDevice configuration.\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
 {\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
   EFI_PEI_READ_ONLY_VARIABLE2_PPI *VariablePpi;\r
   TREE_CONFIGURATION              TrEEConfiguration;\r
   UINTN                           Index;\r


@@ -136,5 +144,15 @@ TrEEConfigPeimEntryPoint (
   Status = PeiServicesInstallPpi (&gTpmSelectedPpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   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
   return Status;\r
 }\r

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

diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
index 4d91dfe02ddc2fda62763354622558c1a31f6d0d..61a8cd082407b3687964a3e8d44e04a92b78ec4d 100644 (file)
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
+++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
@@ -64,7 +64,8 @@
   gEfiPeiFirmwareVolumeInfoPpiGuid                                     ## SOMETIMES_CONSUMES     ## NOTIFY\r
   gEfiPeiFirmwareVolumeInfo2PpiGuid                                    ## SOMETIMES_CONSUMES     ## NOTIFY\r
   gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid                  ## SOMETIMES_CONSUMES\r
   gEfiPeiFirmwareVolumeInfoPpiGuid                                     ## SOMETIMES_CONSUMES     ## NOTIFY\r
   gEfiPeiFirmwareVolumeInfo2PpiGuid                                    ## SOMETIMES_CONSUMES     ## NOTIFY\r
   gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid                  ## SOMETIMES_CONSUMES\r

-  gPeiTpmInitializedPpiGuid                                            ## PRODUCES\r
+  gPeiTpmInitializedPpiGuid                                            ## SOMETIMES_PRODUCES\r
+  gPeiTpmInitializationDonePpiGuid                                     ## PRODUCES\r

   gEfiEndOfPeiSignalPpiGuid                                            ## SOMETIMES_CONSUMES     ## NOTIFY\r
 \r
 [Pcd]\r
   gEfiEndOfPeiSignalPpiGuid                                            ## SOMETIMES_CONSUMES     ## NOTIFY\r
 \r
 [Pcd]\r