-----Original Message-----
From: Zhang, Qi1 <qi1.zhang@...>
Sent: Tuesday, August 18, 2020 2:26 PM
To: devel@edk2.groups.io
Cc: Yao, Jiewen <jiewen.yao@...>; Chiu, Chasel
<chasel.chiu@...>; Desimone, Nathaniel L
<nathaniel.l.desimone@...>; Zeng, Star <star.zeng@...>; Zhang,
Qi1 <qi1.zhang@...>
Subject: [PATCH v4 6/8] IntelFsp2Wrapper/dsc: Add FspTpmMeasurementLib
and PcdFspMeasurementConfig.

From: Jiewen Yao <jiewen.yao@...>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2376

Cc: Jiewen Yao <jiewen.yao@...>
Cc: Chasel Chiu <chasel.chiu@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Star Zeng <star.zeng@...>
Cc: Qi Zhang <qi1.zhang@...>
Signed-off-by: Jiewen Yao <jiewen.yao@...>
---
IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec | 17 +++++++++++++++++
IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc | 6 +++++-
2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
index faf2be621c..cb41ca9807 100644
--- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
+++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
@@ -92,6 +92,23 @@
#
gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection|0x00000001|UINT
8|0x4000000A + ## This PCD decides how FSP is measured+ # 1) The
BootGuard ACM may already measured the FSP component, such as
FSPT/FSPM.+ # We need a flag (PCD) to indicate if there is need to do such
FSP measurement or NOT.+ # 2) The FSP binary includes FSP code and FSP
UPD region. The UPD region is considered+ # as configuration block, and it
may be updated by OEM by design.+ # This flag (PCD) is to indicate if we
need isolate the the UPD region from the FSP code region.+ # BIT0: Need
measure FSP. (for FSP1.x) - reserved in FSP2.+ # BIT1: Need measure FSPT.
(for FSP 2.x)+ # BIT2: Need measure FSPM. (for FSP 2.x)+ # BIT3: Need
measure FSPS. (for FSP 2.x)+ # BIT4~30: reserved.+ # BIT31: Need isolate
UPD region measurement.+ #0: measure FSP[T|M|S] as one binary in
one record (PCR0).+ #1: measure FSP UPD region in one record (PCR1),
the FSP code without UPD in another record (PCR0).+ #+
gIntelFsp2WrapperTokenSpaceGuid.PcdFspMeasurementConfig|0x00000000|
UINT32|0x4000000B+ [PcdsFixedAtBuild,
PcdsPatchableInModule,PcdsDynamic,PcdsDynamicEx] # ## These are
the base address of FSP-M/Sdiff --git
a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
index cb4f69285d..aa2eb26c33 100644
--- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
+++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
@@ -1,7 +1,7 @@
## @file # Provides drivers and definitions to support fsp in EDKII bios. #-#
Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>+#
Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR> #
SPDX-License-Identifier: BSD-2-Clause-Patent # ##@@ -45,6 +45,7 @@
# FSP Wrapper Lib
FspWrapperApiLib|IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/Bas
eFspWrapperApiLib.inf
FspWrapperApiTestLib|IntelFsp2WrapperPkg/Library/BaseFspWrapperApiTes
tLibNull/BaseFspWrapperApiTestLibNull.inf+
FspMeasurementLib|IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/
BaseFspMeasurementLib.inf # FSP platform sample
FspWrapperPlatformLib|IntelFsp2WrapperPkg/Library/BaseFspWrapperPlatf
ormLibSample/BaseFspWrapperPlatformLibSample.inf@@ -57,6 +58,8 @@
PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemory
AllocationLib.inf HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf+
TpmMeasurementLib|SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmM
easurementLib.inf+
TcgEventLogRecordLib|SecurityPkg/Library/TcgEventLogRecordLib/TcgEventLo
gRecordLib.inf [LibraryClasses.common.DXE_DRIVER]
UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryP
oint.inf@@ -73,6 +76,7 @@

IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecFspW
rapperPlatformSecLibSample.inf
IntelFsp2WrapperPkg/Library/PeiFspWrapperHobProcessLibSample/PeiFspWr
apperHobProcessLibSample.inf
IntelFsp2WrapperPkg/Library/PeiFspWrapperApiTestLib/PeiFspWrapperApiTe
stLib.inf+
IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/BaseFspMeasuremen
tLib.inf IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf--
2.26.2.windows.1