Handle TPM device error and avoid deadloop in BDS.

If TPM error happens, set TPM flag to NOT present, so that trusted boot patch is disabled.
Also report status code for failure, so that platform may register handler to apply policy like force system reset, or disable TPM permanently.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <jiewen.yao@intel.com>
Reviewed-by: "Dong, Guo" <guo.dong@intel.com>




git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16598 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 129 insertions, 122 deletions

diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index 282505dbc7..ea05dc8433 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -8,7 +8,7 @@ buffer overflow, integer overflow.
 

 TcgDxePassThroughToTpm() will receive untrusted input and do basic validation.

 

-Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials 

 are licensed and made available under the terms and conditions of the BSD License 

 which accompanies this distribution.  The full text of the license may be found at 

@@ -51,6 +51,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/TpmCommLib.h>

 #include <Library/PcdLib.h>

 #include <Library/UefiLib.h>

+#include <Library/ReportStatusCodeLib.h>

 

 #include "TpmComm.h"

 

@@ -264,7 +265,7 @@ TcgDxeStatusCheck (
   }

 

   if (EventLogLastEntry != NULL) {

-    if (TcgData->BsCap.TPMDeactivatedFlag) {

+    if (TcgData->BsCap.TPMDeactivatedFlag || (!ProtocolCapability.TPMPresentFlag)) {

       *EventLogLastEntry = (EFI_PHYSICAL_ADDRESS)(UINTN)0;

     } else {

       *EventLogLastEntry = (EFI_PHYSICAL_ADDRESS)(UINTN)TcgData->LastEvent;

@@ -411,7 +412,7 @@ TcgDxeLogEvent (
 

   TcgData = TCG_DXE_DATA_FROM_THIS (This);

   

-  if (TcgData->BsCap.TPMDeactivatedFlag) {

+  if (TcgData->BsCap.TPMDeactivatedFlag || (!ProtocolCapability.TPMPresentFlag)) {

     return EFI_DEVICE_ERROR;

   }

   return TcgDxeLogEventI (

@@ -495,8 +496,8 @@ TcgDxeHashLogExtendEventI (
 {

   EFI_STATUS                        Status;

 

-  if (HashData == NULL && HashDataLen > 0) {

-    return EFI_INVALID_PARAMETER;

+  if (!TcgData->BsCap.TPMPresentFlag) {

+    return EFI_DEVICE_ERROR;

   }

 

   if (HashDataLen > 0 || HashData != NULL) {

@@ -507,7 +508,7 @@ TcgDxeHashLogExtendEventI (
                );

     if (EFI_ERROR(Status)) {

       DEBUG ((DEBUG_ERROR, "TpmCommHashAll Failed. %x\n", Status));

-      return Status;

+      goto Done;

     }

   }

 

@@ -521,6 +522,17 @@ TcgDxeHashLogExtendEventI (
     Status = TcgDxeLogEventI (TcgData, NewEventHdr, NewEventData);

   }

 

+Done:

+  if ((Status == EFI_DEVICE_ERROR) || (Status == EFI_TIMEOUT)) {

+    DEBUG ((EFI_D_ERROR, "TcgDxeHashLogExtendEventI - %r. Disable TPM.\n", Status));

+    TcgData->BsCap.TPMPresentFlag = FALSE;

+    REPORT_STATUS_CODE (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      (PcdGet32 (PcdStatusCodeSubClassTpmDevice) | EFI_P_EC_INTERFACE_ERROR)

+      );

+    Status = EFI_DEVICE_ERROR;

+  }

+

   return Status;

 }

 

@@ -569,13 +581,17 @@ TcgDxeHashLogExtendEvent (
 

   TcgData = TCG_DXE_DATA_FROM_THIS (This);

   

-  if (TcgData->BsCap.TPMDeactivatedFlag) {

+  if (TcgData->BsCap.TPMDeactivatedFlag || (!ProtocolCapability.TPMPresentFlag)) {

     return EFI_DEVICE_ERROR;

   }

     

   if (AlgorithmId != TPM_ALG_SHA) {

     return EFI_UNSUPPORTED;

   }

+  

+  if (HashData == NULL && HashDataLen > 0) {

+    return EFI_INVALID_PARAMETER;

+  }

 

   Status = TcgDxeHashLogExtendEventI (

              TcgData,

@@ -1346,6 +1362,10 @@ DriverEntry (
     return Status;

   }

 

+  if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {

+    mTcgDxeData.BsCap.TPMPresentFlag = FALSE;

+  }

+

   Status = GetTpmStatus (&mTcgDxeData.BsCap.TPMDeactivatedFlag);

   if (EFI_ERROR (Status)) {

     DEBUG ((

@@ -1363,7 +1383,7 @@ DriverEntry (
                   EFI_NATIVE_INTERFACE,

                   &mTcgDxeData.TcgProtocol

                   );

-  if (!EFI_ERROR (Status) && !mTcgDxeData.BsCap.TPMDeactivatedFlag) {

+  if (!EFI_ERROR (Status) && (!mTcgDxeData.BsCap.TPMDeactivatedFlag) && ProtocolCapability.TPMPresentFlag) {

     //

     // Setup the log area and copy event log from hob list to it

     //

diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf b/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
index 6cb49124a8..39aeb8b950 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
@@ -2,7 +2,7 @@
 #  Produces TCG protocol and measures boot environment

 #  This module will produce TCG protocol and measure boot environment.

 #

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution. The full text of the license may be found at

@@ -51,6 +51,7 @@
   PrintLib

   UefiLib

   PcdLib

+  ReportStatusCodeLib

 

 [Guids]

   ## SOMETIMES_CONSUMES     ## SystemTable           # Smbios Table

@@ -59,6 +60,7 @@
   

   gEfiGlobalVariableGuid                             ## SOMETIMES_CONSUMES  ## Variable:L"BootXXXX"

   gTcgEventEntryHobGuid                              ## SOMETIMES_CONSUMES  ## HOB

+  gTpmErrorHobGuid                                   ## SOMETIMES_CONSUMES  ## HOB

   gEfiEventExitBootServicesGuid                      ## CONSUMES            ## Event

   gEventExitBootServicesFailedGuid                   ## SOMETIMES_CONSUMES  ## Event

   gEfiTpmDeviceInstanceTpm12Guid                     ## PRODUCES            ## GUID       # TPM device identifier

@@ -76,6 +78,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision       ## SOMETIMES_CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId         ## SOMETIMES_CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision   ## SOMETIMES_CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeSubClassTpmDevice   ## SOMETIMES_CONSUMES

 

 [Depex]

   TRUE

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index 0c00e286ce..dcf4b0bbbd 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c
@@ -1,7 +1,7 @@
 /** @file

   Initialize TPM device and measure FVs before handing off control to DXE.

 

-Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials 

 are licensed and made available under the terms and conditions of the BSD License 

 which accompanies this distribution.  The full text of the license may be found at 

@@ -38,6 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PeiServicesTablePointerLib.h>

 #include <Library/BaseLib.h>

 #include <Library/MemoryAllocationLib.h>

+#include <Library/ReportStatusCodeLib.h>

 

 #include "TpmComm.h"

 

@@ -221,6 +222,10 @@ HashLogExtendEvent (
 {

   EFI_STATUS                        Status;

   VOID                              *HobData;

+  

+  if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {

+    return EFI_DEVICE_ERROR;

+  }

 

   HobData = NULL;

   if (HashDataLen != 0) {

@@ -229,7 +234,9 @@ HashLogExtendEvent (
                HashDataLen,

                &NewEventHdr->Digest

                );

-    ASSERT_EFI_ERROR (Status);

+    if (EFI_ERROR (Status)) {

+      goto Done;

+    }

   }

 

   Status = TpmCommExtend (

@@ -239,20 +246,34 @@ HashLogExtendEvent (
              NewEventHdr->PCRIndex,

              NULL

              );

-  ASSERT_EFI_ERROR (Status);

+  if (EFI_ERROR (Status)) {

+    goto Done;

+  }

 

   HobData = BuildGuidHob (

              &gTcgEventEntryHobGuid,

              sizeof (*NewEventHdr) + NewEventHdr->EventSize

              );

   if (HobData == NULL) {

-    return EFI_OUT_OF_RESOURCES;

+    Status = EFI_OUT_OF_RESOURCES;

+    goto Done;

   }

 

   CopyMem (HobData, NewEventHdr, sizeof (*NewEventHdr));

   HobData = (VOID *) ((UINT8*)HobData + sizeof (*NewEventHdr));

   CopyMem (HobData, NewEventData, NewEventHdr->EventSize);

-  return EFI_SUCCESS;

+

+Done:

+  if ((Status == EFI_DEVICE_ERROR) || (Status == EFI_TIMEOUT)) {

+    DEBUG ((EFI_D_ERROR, "HashLogExtendEvent - %r. Disable TPM.\n", Status));

+    BuildGuidHob (&gTpmErrorHobGuid,0);

+    REPORT_STATUS_CODE (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      (PcdGet32 (PcdStatusCodeSubClassTpmDevice) | EFI_P_EC_INTERFACE_ERROR)

+      );

+    Status = EFI_DEVICE_ERROR;

+  }

+  return Status;

 }

 

 /**

@@ -365,7 +386,6 @@ MeasureFvImage (
              &TcgEventHdr,

              (UINT8*) &FvBlob

              );

-  ASSERT_EFI_ERROR (Status);

 

   //

   // Add new FV into the measured FV list.

@@ -682,7 +702,6 @@ PeimEntryMP (
   if (IsTpmUsable (PeiServices, TpmHandle)) {

     if (PcdGet8 (PcdTpmScrtmPolicy) == 1) {

       Status = MeasureCRTMVersion (PeiServices, TpmHandle);

-      ASSERT_EFI_ERROR (Status);

     }

 

     Status = MeasureMainBios (PeiServices, TpmHandle);

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index c68c9056cf..6a76cf1c2e 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
@@ -4,7 +4,7 @@
 #  This module will initialize TPM device, measure reported FVs and BIOS version.

 #  This module may also lock TPM physical presence and physicalPresenceLifetimeLock.

 #

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution. The full text of the license may be found at

@@ -56,9 +56,11 @@
   BaseLib

   PcdLib

   MemoryAllocationLib

+  ReportStatusCodeLib

 

 [Guids]

   gTcgEventEntryHobGuid                                               ## PRODUCES               ## HOB

+  gTpmErrorHobGuid                                                    ## SOMETIMES_PRODUCES     ## HOB

   gMeasuredFvHobGuid                                                  ## PRODUCES               ## HOB

   gEfiTpmDeviceInstanceTpm12Guid                                      ## PRODUCES               ## GUID       # TPM device identifier

 

@@ -79,6 +81,7 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy            ## CONSUMES

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy                     ## SOMETIMES_CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeSubClassTpmDevice        ## SOMETIMES_CONSUMES

 

 [Depex]

   gEfiPeiMasterBootModePpiGuid AND

diff --git a/SecurityPkg/Tcg/TcgPei/TpmComm.c b/SecurityPkg/Tcg/TcgPei/TpmComm.c
index fb5011ee9d..899c8e3e0b 100644
--- a/SecurityPkg/Tcg/TcgPei/TpmComm.c
+++ b/SecurityPkg/Tcg/TcgPei/TpmComm.c
@@ -1,7 +1,7 @@
 /** @file

   Utility functions used by TPM PEI driver.

   

-Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials 

 are licensed and made available under the terms and conditions of the BSD License 

 which accompanies this distribution.  The full text of the license may be found at 

@@ -222,7 +222,9 @@ TpmCommExtend (
   SendBuffer.PcrIndex       = SwapBytes32 (PcrIndex);

   CopyMem (&SendBuffer.TpmDigest, (UINT8 *)DigestToExtend, sizeof (TPM_DIGEST));

   Status = TisTpmCommand (PeiServices, TpmHandle, (UINT8 *)&SendBuffer, TpmSendSize, RecvBuffer, &TpmRecvSize);

-  ASSERT_EFI_ERROR (Status);

+  if (EFI_ERROR (Status)) {

+    return Status;

+  }

 

   if(NewPcrValue != NULL) {

     CopyMem ((UINT8*)NewPcrValue, &RecvBuffer[10], sizeof (TPM_DIGEST));

diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
index 54e505d136..58c4aff819 100644
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
+++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
@@ -1,7 +1,7 @@
 /** @file

   This module implements TrEE Protocol.

   

-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials 

 are licensed and made available under the terms and conditions of the BSD License 

 which accompanies this distribution.  The full text of the license may be found at 

@@ -48,6 +48,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/Tpm2DeviceLib.h>

 #include <Library/HashLib.h>

 #include <Library/PerformanceLib.h>

+#include <Library/ReportStatusCodeLib.h>

 

 #define PERF_ID_TREE_DXE  0x3120

 

@@ -64,16 +65,13 @@ typedef struct {
 typedef struct {

   EFI_GUID               *EventGuid;

   TREE_EVENT_LOG_FORMAT  LogFormat;

-  UINT32                 BootHashAlg;

-  UINT16                 DigestAlgID;

-  TPMI_ALG_HASH          TpmHashAlgo;

 } TREE_EVENT_INFO_STRUCT;

 

 TREE_EVENT_INFO_STRUCT mTreeEventInfo[] = {

-  {&gTcgEventEntryHobGuid,             TREE_EVENT_LOG_FORMAT_TCG_1_2,      TREE_BOOT_HASH_ALG_SHA1,     0,                       TPM_ALG_SHA1},

+  {&gTcgEventEntryHobGuid,             TREE_EVENT_LOG_FORMAT_TCG_1_2},

 };

 

-#define TCG_EVENT_LOG_AREA_COUNT_MAX   5

+#define TCG_EVENT_LOG_AREA_COUNT_MAX   2

 

 typedef struct {

   TREE_EVENT_LOG_FORMAT             EventLogFormat;

@@ -629,72 +627,6 @@ TcgDxeLogEvent (
 }

 

 /**

-  This function return hash algorithm from event log format.

-

-  @param[in]     EventLogFormat    Event log format.

-

-  @return hash algorithm.

-**/

-TPMI_ALG_HASH

-TrEEGetHashAlgoFromLogFormat (

-  IN      TREE_EVENT_LOG_FORMAT     EventLogFormat

-  )

-{

-  UINTN  Index;

-

-  for (Index = 0; Index < sizeof(mTreeEventInfo)/sizeof(mTreeEventInfo[0]); Index++) {

-    if (mTreeEventInfo[Index].LogFormat == EventLogFormat) {

-      return mTreeEventInfo[Index].TpmHashAlgo;

-    }

-  }

-  return TPM_ALG_SHA1;

-}

-

-/**

-  This function return hash algorithm ID from event log format.

-

-  @param[in]     EventLogFormat    Event log format.

-

-  @return hash algorithm ID.

-**/

-UINT16

-TrEEGetAlgIDFromLogFormat (

-  IN      TREE_EVENT_LOG_FORMAT     EventLogFormat

-  )

-{

-  UINTN  Index;

-

-  for (Index = 0; Index < sizeof(mTreeEventInfo)/sizeof(mTreeEventInfo[0]); Index++) {

-    if (mTreeEventInfo[Index].LogFormat == EventLogFormat) {

-      return mTreeEventInfo[Index].DigestAlgID;

-    }

-  }

-  return 0;

-}

-

-/**

-  This function return boot hash algorithm from event log format.

-

-  @param[in]     EventLogFormat    Event log format.

-

-  @return boot hash algorithm.

-**/

-UINT32

-TrEEGetBootHashAlgFromLogFormat (

-  IN      TREE_EVENT_LOG_FORMAT     EventLogFormat

-  )

-{

-  UINTN  Index;

-

-  for (Index = 0; Index < sizeof(mTreeEventInfo)/sizeof(mTreeEventInfo[0]); Index++) {

-    if (mTreeEventInfo[Index].LogFormat == EventLogFormat) {

-      return mTreeEventInfo[Index].BootHashAlg;

-    }

-  }

-  return TREE_BOOT_HASH_ALG_SHA1;

-}

-

-/**

   This function get digest from digest list.

 

   @param HashAlg    digest algorithm

@@ -811,6 +743,10 @@ TcgDxeHashLogExtendEvent (
 {

   EFI_STATUS                        Status;

   TPML_DIGEST_VALUES                DigestList;

+  

+  if (!mTcgDxeData.BsCap.TrEEPresentFlag) {

+    return EFI_DEVICE_ERROR;

+  }

 

   Status = HashAndExtend (

              NewEventHdr->PCRIndex,

@@ -824,6 +760,15 @@ TcgDxeHashLogExtendEvent (
     }

   }

 

+  if (Status == EFI_DEVICE_ERROR) {

+    DEBUG ((EFI_D_ERROR, "TcgDxeHashLogExtendEvent - %r. Disable TPM.\n", Status));

+    mTcgDxeData.BsCap.TrEEPresentFlag = FALSE;

+    REPORT_STATUS_CODE (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      (PcdGet32 (PcdStatusCodeSubClassTpmDevice) | EFI_P_EC_INTERFACE_ERROR)

+      );

+  }

+

   return Status;

 }

 

@@ -893,6 +838,14 @@ TreeHashLogExtendEvent (
         Status = TcgDxeLogHashEvent (&DigestList, &NewEventHdr, Event->Event);

       }

     }

+    if (Status == EFI_DEVICE_ERROR) {

+      DEBUG ((EFI_D_ERROR, "MeasurePeImageAndExtend - %r. Disable TPM.\n", Status));

+      mTcgDxeData.BsCap.TrEEPresentFlag = FALSE;

+      REPORT_STATUS_CODE (

+        EFI_ERROR_CODE | EFI_ERROR_MINOR,

+        (PcdGet32 (PcdStatusCodeSubClassTpmDevice) | EFI_P_EC_INTERFACE_ERROR)

+        );

+    }

   } else {

     Status = TcgDxeHashLogExtendEvent (

                Flags,

@@ -1614,6 +1567,9 @@ OnReadyToBoot (
     Status = TcgMeasureAction (

                EFI_CALLING_EFI_APPLICATION

                );

+    if (EFI_ERROR (Status)) {

+      DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n", EFI_CALLING_EFI_APPLICATION));

+    }

 

     //

     // 2. Draw a line between pre-boot env and entering post-boot env.

@@ -1621,6 +1577,9 @@ OnReadyToBoot (
     //

     for (PcrIndex = 0; PcrIndex < 7; PcrIndex++) {

       Status = MeasureSeparatorEvent (PcrIndex);

+      if (EFI_ERROR (Status)) {

+        DEBUG ((EFI_D_ERROR, "Seperator Event not Measured. Error!\n"));

+      }

     }

 

     //

@@ -1641,6 +1600,9 @@ OnReadyToBoot (
     Status = TcgMeasureAction (

                EFI_RETURNING_FROM_EFI_APPLICATOIN

                );

+    if (EFI_ERROR (Status)) {

+      DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATOIN));

+    }

   }

 

   DEBUG ((EFI_D_INFO, "TPM2 TrEEDxe Measure Data when ReadyToBoot\n"));

@@ -1858,6 +1820,10 @@ DriverEntry (
     DEBUG ((EFI_D_ERROR, "TPM not detected!\n"));

     return Status;

   }

+  

+  if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {

+    mTcgDxeData.BsCap.TrEEPresentFlag = FALSE;

+  }

 

   //

   // Fill information

diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
index ef8505cf39..e564c8f2a5 100644
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
+++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
@@ -7,7 +7,7 @@
 #  This external input must be validated carefully to avoid security issue like

 #  buffer overflow, integer overflow.

 #

-# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution. The full text of the license may be found at

@@ -57,6 +57,7 @@
   Tpm2DeviceLib

   HashLib

   PerformanceLib

+  ReportStatusCodeLib

 

 [Guids]

   ## SOMETIMES_CONSUMES     ## SystemTable           # Smbios Table

@@ -74,6 +75,7 @@
   gEfiImageSecurityDatabaseGuid

     

   gTcgEventEntryHobGuid                              ## SOMETIMES_CONSUMES  ## HOB

+  gTpmErrorHobGuid                                   ## SOMETIMES_CONSUMES  ## HOB

   gEfiEventExitBootServicesGuid                      ## CONSUMES            ## Event

   gEventExitBootServicesFailedGuid                   ## SOMETIMES_CONSUMES  ## Event

   gEfiTpmDeviceInstanceNoneGuid                      ## SOMETIMES_CONSUMES  ## GUID       # TPM device identifier

@@ -95,6 +97,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision                  ## SOMETIMES_CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId                    ## SOMETIMES_CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision              ## SOMETIMES_CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeSubClassTpmDevice              ## SOMETIMES_CONSUMES

 

 [Depex]

   TRUE

diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c b/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
index 8e2bc748ff..eea40847c5 100644
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
+++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
@@ -1,7 +1,7 @@
 /** @file

   Initialize TPM2 device and measure FVs before handing off control to DXE.

 

-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials 

 are licensed and made available under the terms and conditions of the BSD License 

 which accompanies this distribution.  The full text of the license may be found at 

@@ -40,19 +40,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/TrEEProtocol.h>

 #include <Library/PerformanceLib.h>

 #include <Library/MemoryAllocationLib.h>

+#include <Library/ReportStatusCodeLib.h>

 

 #define PERF_ID_TREE_PEI  0x3080

 

 typedef struct {

   EFI_GUID               *EventGuid;

   TREE_EVENT_LOG_FORMAT  LogFormat;

-  UINT32                 BootHashAlg;

-  UINT16                 DigestAlgID;

-  TPMI_ALG_HASH          TpmHashAlgo;

 } TREE_EVENT_INFO_STRUCT;

 

 TREE_EVENT_INFO_STRUCT mTreeEventInfo[] = {

-  {&gTcgEventEntryHobGuid,             TREE_EVENT_LOG_FORMAT_TCG_1_2,      TREE_BOOT_HASH_ALG_SHA1,     0,                       TPM_ALG_SHA1},

+  {&gTcgEventEntryHobGuid,             TREE_EVENT_LOG_FORMAT_TCG_1_2},

 };

 

 BOOLEAN                 mImageInMemory  = FALSE;

@@ -129,28 +127,6 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
 EFI_PEI_FIRMWARE_VOLUME_INFO_MEASUREMENT_EXCLUDED_PPI *mMeasurementExcludedFvPpi;

 

 /**

-  This function return hash algorithm from event log format.

-

-  @param[in]     EventLogFormat    Event log format.

-

-  @return hash algorithm.

-**/

-TPMI_ALG_HASH

-TrEEGetHashAlgoFromLogFormat (

-  IN      TREE_EVENT_LOG_FORMAT     EventLogFormat

-  )

-{

-  UINTN  Index;

-

-  for (Index = 0; Index < sizeof(mTreeEventInfo)/sizeof(mTreeEventInfo[0]); Index++) {

-    if (mTreeEventInfo[Index].LogFormat == EventLogFormat) {

-      return mTreeEventInfo[Index].TpmHashAlgo;

-    }

-  }

-  return TPM_ALG_SHA1;

-}

-

-/**

   This function get digest from digest list.

 

   @param HashAlg    digest algorithm

@@ -318,6 +294,10 @@ HashLogExtendEvent (
   EFI_STATUS                        Status;

   TPML_DIGEST_VALUES                DigestList;

 

+  if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {

+    return EFI_DEVICE_ERROR;

+  }

+

   Status = HashAndExtend (

              NewEventHdr->PCRIndex,

              HashData,

@@ -329,6 +309,16 @@ HashLogExtendEvent (
       Status = LogHashEvent (&DigestList, NewEventHdr, NewEventData);

     }

   }

+  

+  if (Status == EFI_DEVICE_ERROR) {

+    DEBUG ((EFI_D_ERROR, "HashLogExtendEvent - %r. Disable TPM.\n", Status));

+    BuildGuidHob (&gTpmErrorHobGuid,0);

+    REPORT_STATUS_CODE (

+      EFI_ERROR_CODE | EFI_ERROR_MINOR,

+      (PcdGet32 (PcdStatusCodeSubClassTpmDevice) | EFI_P_EC_INTERFACE_ERROR)

+      );

+  }

+

   return Status;

 }

 

@@ -431,7 +421,6 @@ MeasureFvImage (
              &TcgEventHdr,

              (UINT8*) &FvBlob

              );

-  ASSERT_EFI_ERROR (Status);

 

   //

   // Add new FV into the measured FV list.

@@ -600,7 +589,6 @@ PeimEntryMP (
   

   if (PcdGet8 (PcdTpm2ScrtmPolicy) == 1) {

     Status = MeasureCRTMVersion ();

-    ASSERT_EFI_ERROR (Status);

   }

 

   Status = MeasureMainBios ();

diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
index faa9fb33b0..4d91dfe02d 100644
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
+++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
@@ -3,7 +3,7 @@
 #

 #  This module will initialize TPM device, measure reported FVs and BIOS version.

 #

-# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution. The full text of the license may be found at

@@ -51,9 +51,11 @@
   HashLib

   PerformanceLib

   MemoryAllocationLib

+  ReportStatusCodeLib

 

 [Guids]

   gTcgEventEntryHobGuid                                                ## PRODUCES               ## HOB

+  gTpmErrorHobGuid                                                     ## SOMETIMES_PRODUCES     ## HOB

   gMeasuredFvHobGuid                                                   ## PRODUCES               ## HOB

   gEfiTpmDeviceInstanceNoneGuid                                        ## SOMETIMES_PRODUCES     ## GUID       # TPM device identifier

   gEfiTpmDeviceInstanceTpm12Guid                                       ## SOMETIMES_PRODUCES     ## GUID       # TPM device identifier

@@ -72,6 +74,7 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2SelfTestPolicy                  ## SOMETIMES_CONSUMES

   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2ScrtmPolicy                     ## CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported              ## CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeSubClassTpmDevice         ## SOMETIMES_CONSUMES

 

 [Depex]

   gEfiPeiMasterBootModePpiGuid AND