SecurityPkg: TcgDxe,Tcg2Dxe,TrEEDxe: New PCD for TCG event log and TCG2 final event log area

TCG event log and TCG2 final event log area length can be configurable to meet platform event log
requirement.
PcdTcgLogAreaMinLen    : 0x10000  based on minimum requirement in TCG ACPI Spec 00.37
PcdTcg2FinalLogAreaLen : 0x8000   based on experience value

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>
Reviewed-by: Qin Long <qin.long@intel.com>

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

2 files changed, 8 insertions, 9 deletions

diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index 4e2741c0cf..1e52179885 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -53,8 +53,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include "TpmComm.h"

 

-#define  EFI_TCG_LOG_AREA_SIZE        0x10000

-

 #define TCG_DXE_DATA_FROM_THIS(this)  \

   BASE_CR (this, TCG_DXE_DATA, TcgProtocol)

 

@@ -653,7 +651,7 @@ SetupEventLog (
     Status = gBS->AllocatePages (

                     AllocateMaxAddress,

                     EfiACPIMemoryNVS,

-                    EFI_SIZE_TO_PAGES (EFI_TCG_LOG_AREA_SIZE),

+                    EFI_SIZE_TO_PAGES (PcdGet32 (PcdTcgLogAreaMinLen)),

                     &Lasa

                     );

     if (EFI_ERROR (Status)) {

@@ -664,8 +662,8 @@ SetupEventLog (
     // To initialize them as 0xFF is recommended 

     // because the OS can know the last entry for that.

     //

-    SetMem ((VOID *)(UINTN)mTcgClientAcpiTemplate.Lasa, EFI_TCG_LOG_AREA_SIZE, 0xFF);

-    mTcgClientAcpiTemplate.Laml = EFI_TCG_LOG_AREA_SIZE;

+    SetMem ((VOID *)(UINTN)mTcgClientAcpiTemplate.Lasa, PcdGet32 (PcdTcgLogAreaMinLen), 0xFF);

+    mTcgClientAcpiTemplate.Laml = PcdGet32 (PcdTcgLogAreaMinLen);

   

   } else {

     Lasa = mTcgServerAcpiTemplate.Lasa;

@@ -673,7 +671,7 @@ SetupEventLog (
     Status = gBS->AllocatePages (

                     AllocateMaxAddress,

                     EfiACPIMemoryNVS,

-                    EFI_SIZE_TO_PAGES (EFI_TCG_LOG_AREA_SIZE),

+                    EFI_SIZE_TO_PAGES (PcdGet32 (PcdTcgLogAreaMinLen)),

                     &Lasa

                     );

     if (EFI_ERROR (Status)) {

@@ -684,8 +682,8 @@ SetupEventLog (
     // To initialize them as 0xFF is recommended 

     // because the OS can know the last entry for that.

     //

-    SetMem ((VOID *)(UINTN)mTcgServerAcpiTemplate.Lasa, EFI_TCG_LOG_AREA_SIZE, 0xFF);

-    mTcgServerAcpiTemplate.Laml = EFI_TCG_LOG_AREA_SIZE;

+    SetMem ((VOID *)(UINTN)mTcgServerAcpiTemplate.Lasa, PcdGet32 (PcdTcgLogAreaMinLen), 0xFF);

+    mTcgServerAcpiTemplate.Laml = PcdGet32 (PcdTcgLogAreaMinLen);

   }

 

   GuidHob.Raw = GetHobList ();

diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf b/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
index 0976304883..e5409dfefd 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 - 2015, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2016, 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

@@ -75,6 +75,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId         ## SOMETIMES_CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision   ## SOMETIMES_CONSUMES

   gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeSubClassTpmDevice   ## SOMETIMES_CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTcgLogAreaMinLen              ## CONSUMES

 

 [Depex]

   TRUE