Add TPM2 support defined in trusted computing group.

TCG EFI Protocol Specification for TPM Family 2.0 Revision 1.0 Version 9 at http://www.trustedcomputinggroup.org/resources/tcg_efi_protocol_specification
TCG Physical Presence Interface Specification Version 1.30, Revision 00.52 at http://www.trustedcomputinggroup.org/resources/tcg_physical_presence_interface_specification

Add Tcg2XXX, similar file/directory as TrEEXXX. Old TrEE driver/library can be deprecated.
1) Add Tcg2Pei/Dxe/Smm driver to log event and provide services.
2) Add Dxe/Pei/SmmTcg2PhysicalPresenceLib to support TCG PP.
3) Update Tpm2 library to use TCG2 protocol instead of TrEE protocol.

Test Win8/Win10 with SecureBoot enabled, PCR7 shows bound.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <Jiewen.Yao@intel.com>
Reviewed-by: "Zhang, Chao B" <chao.b.zhang@intel.com>

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

1 files changed, 18 insertions, 18 deletions

diff --git a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
index ffeac59ba4..7a2ec7f221 100644
--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
+++ b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
@@ -1,7 +1,7 @@
 /** @file

   This library is used by other modules to measure data to TPM.

 

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

+Copyright (c) 2012 - 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

@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <PiDxe.h>

 

 #include <Protocol/TcgService.h>

-#include <Protocol/TrEEProtocol.h>

+#include <Protocol/Tcg2Protocol.h>

 

 #include <Library/BaseMemoryLib.h>

 #include <Library/MemoryAllocationLib.h>

@@ -120,37 +120,37 @@ Tpm20MeasureAndLogData (
   )

 {

   EFI_STATUS                Status;

-  EFI_TREE_PROTOCOL         *TreeProtocol;

-  TrEE_EVENT                *TreeEvent;

+  EFI_TCG2_PROTOCOL         *Tcg2Protocol;

+  EFI_TCG2_EVENT            *Tcg2Event;

 

   //

-  // TrEEPresentFlag is checked in HashLogExtendEvent

+  // TPMPresentFlag is checked in HashLogExtendEvent

   //

-  Status = gBS->LocateProtocol (&gEfiTrEEProtocolGuid, NULL, (VOID **) &TreeProtocol);

+  Status = gBS->LocateProtocol (&gEfiTcg2ProtocolGuid, NULL, (VOID **) &Tcg2Protocol);

   if (EFI_ERROR (Status)) {

     return Status;

   }

 

-  TreeEvent = (TrEE_EVENT *) AllocateZeroPool (LogLen + sizeof (TrEE_EVENT));

-  if(TreeEvent == NULL) {

+  Tcg2Event = (EFI_TCG2_EVENT *) AllocateZeroPool (LogLen + sizeof (EFI_TCG2_EVENT));

+  if(Tcg2Event == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

 

-  TreeEvent->Size = (UINT32)LogLen + sizeof (TrEE_EVENT) - sizeof(TreeEvent->Event);

-  TreeEvent->Header.HeaderSize    = sizeof(TrEE_EVENT_HEADER);

-  TreeEvent->Header.HeaderVersion = TREE_EVENT_HEADER_VERSION;

-  TreeEvent->Header.PCRIndex      = PcrIndex;

-  TreeEvent->Header.EventType     = EventType;

-  CopyMem (&TreeEvent->Event[0], EventLog, LogLen);

+  Tcg2Event->Size = (UINT32)LogLen + sizeof (EFI_TCG2_EVENT) - sizeof(Tcg2Event->Event);

+  Tcg2Event->Header.HeaderSize    = sizeof(EFI_TCG2_EVENT_HEADER);

+  Tcg2Event->Header.HeaderVersion = EFI_TCG2_EVENT_HEADER_VERSION;

+  Tcg2Event->Header.PCRIndex      = PcrIndex;

+  Tcg2Event->Header.EventType     = EventType;

+  CopyMem (&Tcg2Event->Event[0], EventLog, LogLen);

 

-  Status = TreeProtocol->HashLogExtendEvent (

-                           TreeProtocol,

+  Status = Tcg2Protocol->HashLogExtendEvent (

+                           Tcg2Protocol,

                            0,

                            (EFI_PHYSICAL_ADDRESS)(UINTN)HashData,

                            HashDataLen,

-                           TreeEvent

+                           Tcg2Event

                            );

-  FreePool (TreeEvent);

+  FreePool (Tcg2Event);

 

   return Status;

 }