|
回复: [edk2-devel] [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Add runtime SetImage support
gaoliming
Bob:
toggle quoted messageShow quoted text
I suggest to obviously describe that FMP protocol services may be available in EFI runtime, and define the standard method to know whether FMP protocol supports runtime attribute. Because UEFI spec is required to be updated, the code enhancement in DxeCapsuleLibFmp and FmpDevicePkg can go through code first process and be placed into edk2-staging first. Thanks Liming
-----邮件原件-----
|
|
|
|
Re: [PATCH] Reallocate TPM Active PCRs based on platform support.
Yao, Jiewen
Would you please confirm if you have run CI and got a PASS result?
toggle quoted messageShow quoted text
-----Original Message-----
|
|
|
|
回复: [edk2-devel] 回复: [PATCH V4 1/3] MdePkg: Introduce CcMeasurementProtocol for CC Guest firmware
gaoliming
Min:
-----邮件原件-----gEfiTcg2ProtocolGuid and gEfiTcg2FinalEventsTableGuid are defined in the section of[Protocols]. I find gEfiTcg2FinalEventsTableGuid is used for configuration table. This is one Guid usage. It should be placed into [Guids] section. You can see hash protocol and hash algorithm guid in MdePkg. gEfiHashProtocolGuid is defined in [Protocols] section, and gEfiHashAlgorithmMD5Guid is defined in [Guids] section. They are both from MdePkg/Include/Protocol/Hash.h. So, I suggest to follow the guid usage to define this Guid into the different section. Thanks Liming
|
|
|
|
回复: [edk2-devel] [PATCH v2 07/16] ArmPkg and MdePkg: Move the AsmMacroIoLib from ArmPkg to MdePkg
gaoliming
Reviewed-by: Liming Gao <gaoliming@...>
toggle quoted messageShow quoted text
-----邮件原件-----
|
|
|
|
Re: [Patch V2 7/7] OvmfPkg: Reproduce builds across source format changes
Yao, Jiewen
Reviewed-by: Jiewen Yao <jiewen.yao@...>
toggle quoted messageShow quoted text
-----Original Message-----
|
|
|
|
Re: [Patch V2 7/7] BaseTools/Conf: Fix Linux GCC ARM build issues with HII
Michael D Kinney
Hi Leif,
toggle quoted messageShow quoted text
I am dropping patch 7 from this series. I am not able to get the ARM build failure resolved at this time. The basic issue is that the GCC builds are using objcopy to create and ELF image with an section named .hii with the HII data. However, objcopy can not set the ELF fields for the ABI correctly and some of the linkers will complain if the ABI does not match, even if there is no code associated with the ELF image. We may need to consider a better solution for generating resource sections that works for all toolchains instead of trying to use objcopy. Mike
-----Original Message-----
|
|
|
|
Event: TianoCore Community Meeting - APAC/NAMO - 11/04/2021
#cal-reminder
devel@edk2.groups.io Calendar <noreply@...>
Reminder: TianoCore Community Meeting - APAC/NAMO When: Where: Organizer: Soumya Guptha Description: Microsoft Teams meeting Join on your computer or mobile app Click here to join the meeting Join with a video conferencing device Video Conference ID: 119 132 712 6 Alternate VTC dialing instructions Or call in (audio only) +1 916-245-6934,,494156131# United States, Sacramento Phone Conference ID: 494 156 131# Find a local number | Reset PIN Learn More | Meeting options
|
|
|
|
Re: [PATCH V4 3/3] SecurityPkg: Support CcMeasurementProtocol in DxeTpmMeasurementLib
Min Xu
Hi, Sami Please see my comments inline. +**/+EFI_STATUS+EFIAPI+CcMeasureAndLogData (+ IN UINT32 PcrIndex,+ IN UINT32 EventType,+ IN VOID *EventLog,+ IN UINT32 LogLen,+ IN VOID *HashData,+ IN UINT64 HashDataLen+ ) [SAMI] Same comment as in patch 2/3. Is it possible to use the typedef for the measurment register index here, please? [Min] Thanks for reminder. It will be fixed. ++ Status = gBS->LocateProtocol (&gEfiCcMeasurementProtocolGuid, NULL, (VOID **) &CcProtocol); [SAMI] Is it possible to return the error code returned by CcProtocol->MapPcrToMrIndex(), please? [Min] Sure. It will be updated in the next version.
Thanks Min_._,_._,_
|
|
|
|
Event: TianoCore Community Meeting - APAC/NAMO - 11/04/2021
#cal-reminder
devel@edk2.groups.io Calendar <noreply@...>
Reminder: TianoCore Community Meeting - APAC/NAMO When: Where: Organizer: Soumya Guptha Description: Microsoft Teams meeting Join on your computer or mobile app Click here to join the meeting Join with a video conferencing device Video Conference ID: 119 132 712 6 Alternate VTC dialing instructions Or call in (audio only) +1 916-245-6934,,494156131# United States, Sacramento Phone Conference ID: 494 156 131# Find a local number | Reset PIN Learn More | Meeting options
|
|
|
|
Re: [PATCH V4 2/3] SecurityPkg: Support CcMeasurementProtocol in DxeTpm2MeasureBootLib
Min Xu
Hi, Sami Please see my comments inline.
From: devel@edk2.groups.io <devel@edk2.groups.io>
On Behalf Of Sami Mujawar
Sent: Tuesday, November 2, 2021 5:43 PM To: Xu, Min M <min.m.xu@...>; devel@edk2.groups.io Cc: Kinney, Michael D <michael.d.kinney@...>; Liming Gao <gaoliming@...>; Liu, Zhiguang <zhiguang.liu@...>; Yao, Jiewen <jiewen.yao@...>; Wang, Jian J <jian.j.wang@...>; Gerd Hoffmann <kraxel@...>; nd <nd@...> Subject: Re: [edk2-devel] [PATCH V4 2/3] SecurityPkg: Support CcMeasurementProtocol in DxeTpm2MeasureBootLib
+/**+ Create CcEvent from Tcg2Event.++ CcEvent is similar to Tcg2Event except the MrIndex.++ @param CcProtocol Pointer to the located Cc Measurement protocol instance.+ @param Tcg2Event Pointer to the Tcg2Event.+ @param EventSize Size of the Event.+ @param EfiCcEvent The created CcEvent++ @retval EFI_SUCCESS Successfully create the CcEvent+ @retval EFI_INVALID_PARAMETER The input parameter is invalid+ @retval EFI_UNSUPPORTED The input PCRIndex cannot be mapped to Cc MR+ @retval EFI_OUT_OF_RESOURCES Out of resource+**/+EFI_STATUS [SAMI] Is EFIAPI needed here? [Min] EFIAPI is not needed here. From the EDKII C Coding Standards Spec (https://edk2-docs.gitbook.io/edk-ii-c-coding-standards-specification/5_source_files/56_declarations_and_types) “The EFIAPI modifier must be used for all UEFI defined API functions, as well as for any function that takes a variable number of arguments. All protocol functions as well as public functions exposed by drivers must also be declared EFIAPI. This establishes a common calling convention for functions that could be referenced by other code that has potentially been built using a different compiler, with a different native calling convention” CreateCcEventFromTcg2Event is only called internally and it will not be exposed outside. So EFIAPI is not needed. +CreateCcEventFromTcg2Event (+ IN EFI_CC_MEASUREMENT_PROTOCOL *CcProtocol,+ IN EFI_TCG2_EVENT *Tcg2Event,+ IN UINT32 EventSize,+ IN OUT EFI_CC_EVENT **EfiCcEvent+ ) [SAMI] I think it may be good to use the typedef for the measurment register index here i.e. EFI_CC_MR_INDEX. [Min] Thanks for reminder. It will be fixed in the next version.
Thanks Min_._,_._,_
|
|
|
|
Re: [PATCH v1] Maintainers.txt: Change SimicsOpenBoardPkg Maintainer
Agyeman, Prince
Reviewed-by: Prince Agyeman <prince.agyeman@...>
toggle quoted messageShow quoted text
Prince
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Desimone, Nathaniel L Sent: Tuesday, November 2, 2021 3:07 PM To: devel@edk2.groups.io Cc: Agyeman, Prince <prince.agyeman@...>; Leif Lindholm <leif@...>; Kinney, Michael D <michael.d.kinney@...> Subject: [edk2-devel] [PATCH v1] Maintainers.txt: Change SimicsOpenBoardPkg Maintainer To help keep edk2-platforms healthy, I would like to offer to maintain SimicsOpenBoardPkg, SimicsX58SktPkg, and SimicsIch10Pkg. The current maintainer for those packages has changed jobs and is no longer active in the community. Cc: Agyeman Prince <prince.agyeman@...> Cc: Leif Lindholm <leif@...> Cc: Michael D Kinney <michael.d.kinney@...> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@...> --- Maintainers.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Maintainers.txt b/Maintainers.txt index c839c71b22..8d9d454347 100644 --- a/Maintainers.txt +++ b/Maintainers.txt @@ -235,7 +235,7 @@ M: Chasel Chiu <chasel.chiu@...> Platform/Intel/SimicsOpenBoardPkg F: Platform/Intel/SimicsOpenBoardPkg/ -M: Agyeman Prince <prince.agyeman@...> +M: Nate DeSimone <nathaniel.l.desimone@...> Platform/Intel/Tools F: Platform/Intel/Tools/ @@ -301,11 +301,11 @@ M: Chasel Chiu <chasel.chiu@...> Silicon/Intel/SimicsX58SktPkg F: Silicon/Intel/SimicsX58SktPkg/ -M: Agyeman Prince <prince.agyeman@...> +M: Nate DeSimone <nathaniel.l.desimone@...> Silicon/Intel/SimicsIch10Pkg F: Silicon/Intel/SimicsIch10Pkg/ -M: Agyeman Prince <prince.agyeman@...> +M: Nate DeSimone <nathaniel.l.desimone@...> Silicon/Intel/Tools F: Silicon/Intel/Tools/ -- 2.27.0.windows.1
|
|
|
|
Re: [PATCH V3 14/29] UefiCpuPkg: Enable Tdx support in MpInitLib
Min Xu
On November 4, 2021 11:21 PM, Tom Lendacky wrote:
On 11/4/21 3:10 AM, Gerd Hoffmann wrote:Do you mean put the basic Tdx functions in MdePkg/Library/BaseLib? If that is the case, then I would add below basic Tdx functions in BaseLib:On Wed, Nov 03, 2021 at 12:57:37PM +0000, Xu, Min M wrote:Can't you create something in MdePkg/Library/Baselib and then use itOn November 3, 2021 2:09 PM, Gerd Hoffmann wrote:+++ b/UefiCpuPkg/Library/MpInitLib/X64/IntelTdcall.nasmHmm, could you just use TdxLib instead of bringing your own copy of - TdIsEnabled () - TdCall () - TdVmCall () Gerd, what's your thought? Thanks Min
|
|
|
|
Re: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Add runtime SetImage support
Bob Morgan
Hi Liming,
toggle quoted messageShow quoted text
The Uefi spec Version 2.9 appears to have some inconsistencies regarding the possibility of runtime processing of FMP capsules. The UpdateCapsule() runtime service in Section 8.5.3 states that "the firmware may process the capsule immediately", but in Section 23.3.1, where the FMP capsule is described, the last paragraph states "By definition Firmware Management protocol services are not available in EFI runtime". I think the following spec changes would document the optional runtime FMP capsule processing as implemented in this patch: 1. Reword Section 23.3.1 Description last paragraph, first sentence. From: "By definition Firmware Management protocol services are not available in EFI runtime and depending upon platform capabilities, EFI runtime delivery of this capsule may not be supported and may return an error when delivered in EFI runtime with CAPSULE_FLAGS_PERSIST_ACROSS_RESET bit defined." To something like this: "Depending upon platform capabilities, EFI runtime delivery or processing of this capsule may not be supported and may return an error when delivered in EFI runtime. 2. Reword Section 23.3.3 Step 3. From: "If system is not in boot services and platform does not support persistence of capsule across reset when initiated within EFI Runtime, EFI_OUT_OF_RESOURCES error is returned." To something like this: "If system is not in boot services and the CAPSULE_FLAGS_PERSIST_ACROSS_RESET flag is set, but the platform does not support persistence of capsule across reset when initiated within EFI Runtime, EFI_OUT_OF_RESOURCES error is returned." <<<By the way, UpdateCapsule() currently appears to return EFI_UNSUPPORTED in this case, see the IsPersistAcrossResetCapsuleSupported () check near the end>>> 3. Add runtime FMP support info to Section 23.3.3 Step 3. If system is not in boot services and the CAPSULE_FLAGS_PERSIST_ACROSS_RESET flag is not set, but the platform does not support processing of capsules within EFI Runtime, EFI_OUT_OF_RESOURCES error is returned. If the platform supports processing of capsules within EFI Runtime, steps 4-10 are not applicable and the capsules are processed according to steps 11-14. Let me know what you think and we can get an ECR process started to update the spec. Thanks, -bob
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming via groups.io Sent: Monday, November 1, 2021 7:17 PM To: devel@edk2.groups.io; Bob Morgan <bobm@...> Cc: 'Jian J Wang' <jian.j.wang@...>; 'Guomin Jiang' <guomin.jiang@...> Subject: 回复: [edk2-devel] [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Add runtime SetImage support External email: Use caution opening links or attachments Bob: Thanks for your detail. PcdRuntimeFmpCapsuleImageTypeIdGuid is edk2 implementation solution. Have you the proposal on how to update UEFI spec to support runtime FMP protocol? Thanks Liming -----邮件原件-----
|
|
|
|
[PATCH] Reallocate TPM Active PCRs based on platform support.
Rodrigo Gonzalez del Cueto
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3515
In V3: Cleaned up comments, debug prints and updated patch to use the new debug ENUM definitions. - Replaced EFI_D_INFO with DEBUG_INFO. - Replaced EFI_D_VERBOSE with DEBUG_VERBOSE. In V2: Add case to RegisterHashInterfaceLib logic RegisterHashInterfaceLib needs to correctly handle registering the HashLib instance supported algorithm bitmap when PcdTpm2HashMask is set to zero. The current implementation of SyncPcrAllocationsAndPcrMask() triggers PCR bank reallocation only based on the intersection between TpmActivePcrBanks and PcdTpm2HashMask. When the software HashLibBaseCryptoRouter solution is used, no PCR bank reallocation is occurring based on the supported hashing algorithms registered by the HashLib instances. Need to have an additional check for the intersection between the TpmActivePcrBanks and the PcdTcg2HashAlgorithmBitmap populated by the HashLib instances present on the platform's BIOS. Signed-off-by: Rodrigo Gonzalez del Cueto <rodrigo.gonzalez.del.cueto@...> Cc: Jian J Wang <jian.j.wang@...> Cc: Jiewen Yao <jiewen.yao@...> --- SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c | 6 +++++- SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c | 6 +++++- SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 67 ++++++++++++++++++++++++++++++++++++++++++------------------------- SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf | 1 + 4 files changed, 53 insertions(+), 27 deletions(-) diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c index 7a0f61efbb..0821159120 100644 --- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c +++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.c @@ -230,13 +230,17 @@ RegisterHashInterfaceLib ( { UINTN Index; UINT32 HashMask; + UINT32 Tpm2HashMask; EFI_STATUS Status; // // Check allow // HashMask = Tpm2GetHashMaskFromAlgo (&HashInterface->HashGuid); - if ((HashMask & PcdGet32 (PcdTpm2HashMask)) == 0) { + Tpm2HashMask = PcdGet32 (PcdTpm2HashMask); + + if ((Tpm2HashMask != 0) && + ((HashMask & Tpm2HashMask) == 0)) { return EFI_UNSUPPORTED; } diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c index 42cb562f67..6ae51dbce4 100644 --- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c +++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c @@ -327,13 +327,17 @@ RegisterHashInterfaceLib ( UINTN Index; HASH_INTERFACE_HOB *HashInterfaceHob; UINT32 HashMask; + UINT32 Tpm2HashMask; EFI_STATUS Status; // // Check allow // HashMask = Tpm2GetHashMaskFromAlgo (&HashInterface->HashGuid); - if ((HashMask & PcdGet32 (PcdTpm2HashMask)) == 0) { + Tpm2HashMask = PcdGet32 (PcdTpm2HashMask); + + if ((Tpm2HashMask != 0) && + ((HashMask & Tpm2HashMask) == 0)) { return EFI_UNSUPPORTED; } diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c index 93a8803ff6..582b9377e5 100644 --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c @@ -1,7 +1,7 @@ /** @file Initialize TPM2 device and measure FVs before handing off control to DXE. -Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.<BR> Copyright (c) 2017, Microsoft Corporation. All rights reserved. <BR> SPDX-License-Identifier: BSD-2-Clause-Patent @@ -253,7 +253,7 @@ EndofPeiSignalNotifyCallBack ( /** Make sure that the current PCR allocations, the TPM supported PCRs, - and the PcdTpm2HashMask are all in agreement. + PcdTcg2HashAlgorithmBitmap and the PcdTpm2HashMask are all in agreement. **/ VOID SyncPcrAllocationsAndPcrMask ( @@ -262,52 +262,68 @@ SyncPcrAllocationsAndPcrMask ( { EFI_STATUS Status; EFI_TCG2_EVENT_ALGORITHM_BITMAP TpmHashAlgorithmBitmap; + EFI_TCG2_EVENT_ALGORITHM_BITMAP BiosHashAlgorithmBitmap; UINT32 TpmActivePcrBanks; UINT32 NewTpmActivePcrBanks; UINT32 Tpm2PcrMask; UINT32 NewTpm2PcrMask; - DEBUG ((EFI_D_ERROR, "SyncPcrAllocationsAndPcrMask!\n")); + DEBUG ((DEBUG_ERROR, "SyncPcrAllocationsAndPcrMask!\n")); // // Determine the current TPM support and the Platform PCR mask. // Status = Tpm2GetCapabilitySupportedAndActivePcrs (&TpmHashAlgorithmBitmap, &TpmActivePcrBanks); + ASSERT_EFI_ERROR (Status); + DEBUG ((DEBUG_INFO, "Tpm2GetCapabilitySupportedAndActivePcrs - TpmHashAlgorithmBitmap: 0x%08x\n", TpmHashAlgorithmBitmap)); + DEBUG ((DEBUG_INFO, "Tpm2GetCapabilitySupportedAndActivePcrs - TpmActivePcrBanks 0x%08x\n", TpmActivePcrBanks)); + Tpm2PcrMask = PcdGet32 (PcdTpm2HashMask); if (Tpm2PcrMask == 0) { // - // if PcdTPm2HashMask is zero, use ActivePcr setting + // If PcdTpm2HashMask is zero, use ActivePcr setting. + // Only when PcdTpm2HashMask is initialized to 0, will it be updated to current Active Pcrs. // PcdSet32S (PcdTpm2HashMask, TpmActivePcrBanks); Tpm2PcrMask = TpmActivePcrBanks; } + DEBUG ((DEBUG_INFO, "Tpm2PcrMask 0x%08x\n", Tpm2PcrMask)); // - // Find the intersection of Pcd support and TPM support. - // If banks are missing from the TPM support that are in the PCD, update the PCD. - // If banks are missing from the PCD that are active in the TPM, reallocate the banks and reboot. - // - - // - // If there are active PCR banks that are not supported by the Platform mask, - // update the TPM allocations and reboot the machine. + // The Active PCRs in the TPM need to be a strict subset of the hashing algorithms supported by BIOS. // - if ((TpmActivePcrBanks & Tpm2PcrMask) != TpmActivePcrBanks) { - NewTpmActivePcrBanks = TpmActivePcrBanks & Tpm2PcrMask; - - DEBUG ((EFI_D_INFO, "%a - Reallocating PCR banks from 0x%X to 0x%X.\n", __FUNCTION__, TpmActivePcrBanks, NewTpmActivePcrBanks)); + // * Find the intersection of Pcd support and TPM active PCRs. If banks are missing from the TPM support + // that are in the PCD, update the PCD. + // * Find intersection of TPM Active PCRs and BIOS supported algorithms. If there are active PCR banks + // that are not supported by the platform, update the TPM allocations and reboot. + // Note: When the HashLibBaseCryptoRouter solution is used, the hash algorithm support from BIOS is reported + // by Tcg2HashAlgorithmBitmap, which is populated by HashLib instances at runtime. + BiosHashAlgorithmBitmap = PcdGet32 (PcdTcg2HashAlgorithmBitmap); + DEBUG ((DEBUG_INFO, "Tcg2HashAlgorithmBitmap: 0x%08x\n", BiosHashAlgorithmBitmap)); + + if (((TpmActivePcrBanks & Tpm2PcrMask) != TpmActivePcrBanks) || + ((TpmActivePcrBanks & BiosHashAlgorithmBitmap) != TpmActivePcrBanks)) { + DEBUG ((DEBUG_INFO, "TpmActivePcrBanks & Tpm2PcrMask = 0x%08x\n", (TpmActivePcrBanks & Tpm2PcrMask))); + DEBUG ((DEBUG_INFO, "TpmActivePcrBanks & BiosHashAlgorithmBitmap = 0x%08x\n", (TpmActivePcrBanks & BiosHashAlgorithmBitmap))); + NewTpmActivePcrBanks = TpmActivePcrBanks; + NewTpmActivePcrBanks &= Tpm2PcrMask; + NewTpmActivePcrBanks &= BiosHashAlgorithmBitmap; + DEBUG ((DEBUG_INFO, "NewTpmActivePcrBanks 0x%08x\n", NewTpmActivePcrBanks)); + + DEBUG ((DEBUG_INFO, "%a - Reallocating PCR banks from 0x%X to 0x%X.\n", __FUNCTION__, TpmActivePcrBanks, NewTpmActivePcrBanks)); if (NewTpmActivePcrBanks == 0) { - DEBUG ((EFI_D_ERROR, "%a - No viable PCRs active! Please set a less restrictive value for PcdTpm2HashMask!\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a - No viable PCRs active! Please set a less restrictive value for PcdTpm2HashMask!\n", __FUNCTION__)); ASSERT (FALSE); } else { + DEBUG ((DEBUG_ERROR, "Tpm2PcrAllocateBanks (TpmHashAlgorithmBitmap: 0x%08x, NewTpmActivePcrBanks: 0x%08x)\n", TpmHashAlgorithmBitmap, NewTpmActivePcrBanks)); Status = Tpm2PcrAllocateBanks (NULL, (UINT32)TpmHashAlgorithmBitmap, NewTpmActivePcrBanks); if (EFI_ERROR (Status)) { // // We can't do much here, but we hope that this doesn't happen. // - DEBUG ((EFI_D_ERROR, "%a - Failed to reallocate PCRs!\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a - Failed to reallocate PCRs!\n", __FUNCTION__)); ASSERT_EFI_ERROR (Status); } // @@ -324,13 +340,14 @@ SyncPcrAllocationsAndPcrMask ( if ((Tpm2PcrMask & TpmHashAlgorithmBitmap) != Tpm2PcrMask) { NewTpm2PcrMask = Tpm2PcrMask & TpmHashAlgorithmBitmap; - DEBUG ((EFI_D_INFO, "%a - Updating PcdTpm2HashMask from 0x%X to 0x%X.\n", __FUNCTION__, Tpm2PcrMask, NewTpm2PcrMask)); + DEBUG ((DEBUG_ERROR, "%a - Updating PcdTpm2HashMask from 0x%X to 0x%X.\n", __FUNCTION__, Tpm2PcrMask, NewTpm2PcrMask)); if (NewTpm2PcrMask == 0) { - DEBUG ((EFI_D_ERROR, "%a - No viable PCRs supported! Please set a less restrictive value for PcdTpm2HashMask!\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a - No viable PCRs supported! Please set a less restrictive value for PcdTpm2HashMask!\n", __FUNCTION__)); ASSERT (FALSE); } Status = PcdSet32S (PcdTpm2HashMask, NewTpm2PcrMask); + DEBUG ((DEBUG_ERROR, "Set PcdTpm2Hash Mask to 0x%08x\n", NewTpm2PcrMask)); ASSERT_EFI_ERROR (Status); } } @@ -365,7 +382,7 @@ LogHashEvent ( RetStatus = EFI_SUCCESS; for (Index = 0; Index < sizeof(mTcg2EventInfo)/sizeof(mTcg2EventInfo[0]); Index++) { if ((SupportedEventLogs & mTcg2EventInfo[Index].LogFormat) != 0) { - DEBUG ((EFI_D_INFO, " LogFormat - 0x%08x\n", mTcg2EventInfo[Index].LogFormat)); + DEBUG ((DEBUG_INFO, " LogFormat - 0x%08x\n", mTcg2EventInfo[Index].LogFormat)); switch (mTcg2EventInfo[Index].LogFormat) { case EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2: Status = GetDigestFromDigestList (TPM_ALG_SHA1, DigestList, &NewEventHdr->Digest); @@ -476,7 +493,7 @@ HashLogExtendEvent ( } if (Status == EFI_DEVICE_ERROR) { - DEBUG ((EFI_D_ERROR, "HashLogExtendEvent - %r. Disable TPM.\n", Status)); + DEBUG ((DEBUG_ERROR, "HashLogExtendEvent - %r. Disable TPM.\n", Status)); BuildGuidHob (&gTpmErrorHobGuid,0); REPORT_STATUS_CODE ( EFI_ERROR_CODE | EFI_ERROR_MINOR, @@ -1011,7 +1028,7 @@ PeimEntryMA ( } if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) { - DEBUG ((EFI_D_ERROR, "TPM2 error!\n")); + DEBUG ((DEBUG_ERROR, "TPM2 error!\n")); return EFI_DEVICE_ERROR; } @@ -1075,7 +1092,7 @@ PeimEntryMA ( for (PcrIndex = 0; PcrIndex < 8; PcrIndex++) { Status = MeasureSeparatorEventWithError (PcrIndex); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Separator Event with Error not Measured. Error!\n")); + DEBUG ((DEBUG_ERROR, "Separator Event with Error not Measured. Error!\n")); } } } @@ -1106,7 +1123,7 @@ PeimEntryMA ( Done: if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "TPM2 error! Build Hob\n")); + DEBUG ((DEBUG_ERROR, "TPM2 error! Build Hob\n")); BuildGuidHob (&gTpmErrorHobGuid,0); REPORT_STATUS_CODE ( EFI_ERROR_CODE | EFI_ERROR_MINOR, diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf index 06c26a2904..17ad116126 100644 --- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf +++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf @@ -86,6 +86,7 @@ ## SOMETIMES_CONSUMES ## SOMETIMES_PRODUCES gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask + gEfiSecurityPkgTokenSpaceGuid.PcdTcg2HashAlgorithmBitmap ## CONSUMES [Depex] gEfiPeiMasterBootModePpiGuid AND -- 2.33.1.windows.1
|
|
|
|
Re: [PATCH v1 05/16] ArmPkg and MdePkg: Move the Arm CompilerIntrinsicsLib to MdePkg
Bret Barkelew
Will address.
On Wed, Nov 3, 2021 at 11:24 PM Andrew Fish <afish@...> wrote:
|
|
|
|
Re: [Patch V2 7/7] BaseTools/Conf: Fix Linux GCC ARM build issues with HII
Michael D Kinney
Hi Leif,
toggle quoted messageShow quoted text
I will add NOOPT information to the commit message. Unfortunately, this change caused a boot to shell failure for ArmVirtPkg QEMU. TFTP dynamic shell command failed to find HII package. https://github.com/tianocore/edk2/pull/2166 https://dev.azure.com/tianocore/edk2-ci/_build/results?buildId=32907&view=logs&j=cf2d8b26-a21c-5c68-abf4-b944c123e462&t=5ffbbe5c-1d3a-55f5-5ef3-8a0ef80d76a1&l=547 I am investigating and will send a V3 with updates. Mike
-----Original Message-----
|
|
|
|
Re: [PATCH 1/1] OvmfPkg/AmdSev: remove unused SMM bits from .dsc and .fdf files
Dov Murik
Thanks Gerd,
On 04/11/2021 11:21, Gerd Hoffmann wrote: Signed-off-by: Gerd Hoffmann <kraxel@...> Reviewed-by: Dov Murik <dovmurik@...> Tested-by: Dov Murik <dovmurik@...> -Dov ---
|
|
|
|
Event: TianoCore Community Meeting - EMEA / NAMO - 11/04/2021
#cal-reminder
devel@edk2.groups.io Calendar <noreply@...>
Reminder: TianoCore Community Meeting - EMEA / NAMO When: Where: Organizer: Soumya Guptha Description: Microsoft Teams meeting Join on your computer or mobile app Click here to join the meeting Join with a video conferencing device Video Conference ID: 111 422 379 4 Alternate VTC dialing instructions Or call in (audio only) +1 916-245-6934,,482062805# United States, Sacramento Phone Conference ID: 482 062 805# Find a local number | Reset PIN Learn More | Meeting options
|
|
|
|
Event: TianoCore Community Meeting - EMEA / NAMO - 11/04/2021
#cal-reminder
devel@edk2.groups.io Calendar <noreply@...>
Reminder: TianoCore Community Meeting - EMEA / NAMO When: Where: Organizer: Soumya Guptha Description: Microsoft Teams meeting Join on your computer or mobile app Click here to join the meeting Join with a video conferencing device Video Conference ID: 111 422 379 4 Alternate VTC dialing instructions Or call in (audio only) +1 916-245-6934,,482062805# United States, Sacramento Phone Conference ID: 482 062 805# Find a local number | Reset PIN Learn More | Meeting options
|
|
|
|
Re: [PATCH V3 14/29] UefiCpuPkg: Enable Tdx support in MpInitLib
Lendacky, Thomas
On 11/4/21 3:10 AM, Gerd Hoffmann wrote:
On Wed, Nov 03, 2021 at 12:57:37PM +0000, Xu, Min M wrote:Can't you create something in MdePkg/Library/Baselib and then use it everywhere it's needed?On November 3, 2021 2:09 PM, Gerd Hoffmann wrote:+++ b/UefiCpuPkg/Library/MpInitLib/X64/IntelTdcall.nasmHmm, could you just use TdxLib instead of bringing your own copy of the Thanks, Tom take care,
|
|
|