tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 08:04:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdePkg: Change use of EFI_D_* to DEBUG_*

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739

Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Michael D Kinney 2021-11-16 19:21:31 -08:00 committed by mergify[bot]
parent 87000d7708
commit 5f289f3ae3
6 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MdePkg/Include/Library/DebugLib.h
View File

@ -448,7 +448,7 @@ UnitTestDebugAssert (
do { \ do { \
if (DebugAssertEnabled ()) { \ if (DebugAssertEnabled ()) { \
if (EFI_ERROR (StatusParameter)) { \ if (EFI_ERROR (StatusParameter)) { \
DEBUG ((EFI_D_ERROR, "\nASSERT_EFI_ERROR (Status = %r)\n", StatusParameter)); \ DEBUG ((DEBUG_ERROR, "\nASSERT_EFI_ERROR (Status = %r)\n", StatusParameter)); \
_ASSERT (!EFI_ERROR (StatusParameter)); \ _ASSERT (!EFI_ERROR (StatusParameter)); \
} \ } \
} \ } \

3
MdePkg/Library/BasePeCoffLib/Arm/PeCoffLoaderEx.c
View File

@ -235,10 +235,9 @@ PeHotRelocateImageEx (
ASSERT (FALSE); ASSERT (FALSE);
// break omitted - ARM instruction encoding not implemented // break omitted - ARM instruction encoding not implemented
default: default:
DEBUG ((EFI_D_ERROR, "PeHotRelocateEx:unknown fixed type\n")); DEBUG ((DEBUG_ERROR, "PeHotRelocateEx:unknown fixed type\n"));
return RETURN_UNSUPPORTED; return RETURN_UNSUPPORTED;
} }
return RETURN_SUCCESS; return RETURN_SUCCESS;
} }

4
MdePkg/Library/BasePostCodeLibDebug/PostCode.c
View File

@ -36,7 +36,7 @@ PostCode (
IN UINT32 Value IN UINT32 Value
) )
{ {
DEBUG((EFI_D_INFO, "POST %08x\n", Value)); DEBUG((DEBUG_INFO, "POST %08x\n", Value));
return Value; return Value;
} }
@ -72,7 +72,7 @@ PostCodeWithDescription (
IN CONST CHAR8 *Description OPTIONAL IN CONST CHAR8 *Description OPTIONAL
) )
{ {
DEBUG((EFI_D_INFO, "POST %08x - %s\n", Value, Description)); DEBUG((DEBUG_INFO, "POST %08x - %s\n", Value, Description));
return Value; return Value;
} }

22
MdePkg/Library/DxeHstiLib/HstiDxe.c
View File

@ -161,15 +161,15 @@ InternalHstiIsValidTable (
// basic check for header // basic check for header
// //
if (HstiData == NULL) { if (HstiData == NULL) {
DEBUG ((EFI_D_ERROR, "HstiData == NULL\n")); DEBUG ((DEBUG_ERROR, "HstiData == NULL\n"));
return FALSE; return FALSE;
} }
if (HstiSize < sizeof(ADAPTER_INFO_PLATFORM_SECURITY)) { if (HstiSize < sizeof(ADAPTER_INFO_PLATFORM_SECURITY)) {
DEBUG ((EFI_D_ERROR, "HstiSize < sizeof(ADAPTER_INFO_PLATFORM_SECURITY)\n")); DEBUG ((DEBUG_ERROR, "HstiSize < sizeof(ADAPTER_INFO_PLATFORM_SECURITY)\n"));
return FALSE; return FALSE;
} }
if (((HstiSize - sizeof(ADAPTER_INFO_PLATFORM_SECURITY)) / 3) < Hsti->SecurityFeaturesSize) { if (((HstiSize - sizeof(ADAPTER_INFO_PLATFORM_SECURITY)) / 3) < Hsti->SecurityFeaturesSize) {
DEBUG ((EFI_D_ERROR, "((HstiSize - sizeof(ADAPTER_INFO_PLATFORM_SECURITY)) / 3) < SecurityFeaturesSize\n")); DEBUG ((DEBUG_ERROR, "((HstiSize - sizeof(ADAPTER_INFO_PLATFORM_SECURITY)) / 3) < SecurityFeaturesSize\n"));
return FALSE; return FALSE;
} }
@ -177,7 +177,7 @@ InternalHstiIsValidTable (
// Check Version // Check Version
// //
if (Hsti->Version != PLATFORM_SECURITY_VERSION_VNEXTCS) { if (Hsti->Version != PLATFORM_SECURITY_VERSION_VNEXTCS) {
DEBUG ((EFI_D_ERROR, "Version != PLATFORM_SECURITY_VERSION_VNEXTCS\n")); DEBUG ((DEBUG_ERROR, "Version != PLATFORM_SECURITY_VERSION_VNEXTCS\n"));
return FALSE; return FALSE;
} }
@ -186,8 +186,8 @@ InternalHstiIsValidTable (
// //
if ((Hsti->Role < PLATFORM_SECURITY_ROLE_PLATFORM_REFERENCE) || if ((Hsti->Role < PLATFORM_SECURITY_ROLE_PLATFORM_REFERENCE) ||
(Hsti->Role > PLATFORM_SECURITY_ROLE_IMPLEMENTOR_ODM)) { (Hsti->Role > PLATFORM_SECURITY_ROLE_IMPLEMENTOR_ODM)) {
DEBUG ((EFI_D_ERROR, "Role < PLATFORM_SECURITY_ROLE_PLATFORM_REFERENCE ||\n")); DEBUG ((DEBUG_ERROR, "Role < PLATFORM_SECURITY_ROLE_PLATFORM_REFERENCE ||\n"));
DEBUG ((EFI_D_ERROR, "Role > PLATFORM_SECURITY_ROLE_IMPLEMENTOR_ODM\n")); DEBUG ((DEBUG_ERROR, "Role > PLATFORM_SECURITY_ROLE_IMPLEMENTOR_ODM\n"));
return FALSE; return FALSE;
} }
@ -200,7 +200,7 @@ InternalHstiIsValidTable (
} }
} }
if (Index == sizeof(Hsti->ImplementationID)/sizeof(Hsti->ImplementationID[0])) { if (Index == sizeof(Hsti->ImplementationID)/sizeof(Hsti->ImplementationID[0])) {
DEBUG ((EFI_D_ERROR, "ImplementationID has no NUL CHAR\n")); DEBUG ((DEBUG_ERROR, "ImplementationID has no NUL CHAR\n"));
return FALSE; return FALSE;
} }
@ -211,11 +211,11 @@ InternalHstiIsValidTable (
// basic check for ErrorString // basic check for ErrorString
// //
if (ErrorStringSize == 0) { if (ErrorStringSize == 0) {
DEBUG ((EFI_D_ERROR, "ErrorStringSize == 0\n")); DEBUG ((DEBUG_ERROR, "ErrorStringSize == 0\n"));
return FALSE; return FALSE;
} }
if ((ErrorStringSize & BIT0) != 0) { if ((ErrorStringSize & BIT0) != 0) {
DEBUG ((EFI_D_ERROR, "(ErrorStringSize & BIT0) != 0\n")); DEBUG ((DEBUG_ERROR, "(ErrorStringSize & BIT0) != 0\n"));
return FALSE; return FALSE;
} }
@ -232,11 +232,11 @@ InternalHstiIsValidTable (
// check the length of ErrorString // check the length of ErrorString
// //
if (ErrorChar != 0) { if (ErrorChar != 0) {
DEBUG ((EFI_D_ERROR, "ErrorString has no NUL CHAR\n")); DEBUG ((DEBUG_ERROR, "ErrorString has no NUL CHAR\n"));
return FALSE; return FALSE;
} }
if (ErrorStringLength == (ErrorStringSize/2)) { if (ErrorStringLength == (ErrorStringSize/2)) {
DEBUG ((EFI_D_ERROR, "ErrorString Length incorrect\n")); DEBUG ((DEBUG_ERROR, "ErrorString Length incorrect\n"));
return FALSE; return FALSE;
} }

24
MdePkg/Library/SmmMemLib/SmmMemLib.c
View File

@ -97,7 +97,7 @@ SmmMemLibInternalCalculateMaximumSupportAddress (
// Save the maximum support address in one global variable // Save the maximum support address in one global variable
// //
mSmmMemLibInternalMaximumSupportAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)(LShiftU64 (1, PhysicalAddressBits) - 1); mSmmMemLibInternalMaximumSupportAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)(LShiftU64 (1, PhysicalAddressBits) - 1);
DEBUG ((EFI_D_INFO, "mSmmMemLibInternalMaximumSupportAddress = 0x%lx\n", mSmmMemLibInternalMaximumSupportAddress)); DEBUG ((DEBUG_INFO, "mSmmMemLibInternalMaximumSupportAddress = 0x%lx\n", mSmmMemLibInternalMaximumSupportAddress));
} }
/** /**
@ -129,7 +129,7 @@ SmmIsBufferOutsideSmmValid (
// Overflow happen // Overflow happen
// //
DEBUG (( DEBUG ((
EFI_D_ERROR, DEBUG_ERROR,
"SmmIsBufferOutsideSmmValid: Overflow: Buffer (0x%lx) - Length (0x%lx), MaximumSupportAddress (0x%lx)\n", "SmmIsBufferOutsideSmmValid: Overflow: Buffer (0x%lx) - Length (0x%lx), MaximumSupportAddress (0x%lx)\n",
Buffer, Buffer,
Length, Length,
@ -142,13 +142,13 @@ SmmIsBufferOutsideSmmValid (
if (((Buffer >= mSmmMemLibInternalSmramRanges[Index].CpuStart) && (Buffer < mSmmMemLibInternalSmramRanges[Index].CpuStart + mSmmMemLibInternalSmramRanges[Index].PhysicalSize)) || if (((Buffer >= mSmmMemLibInternalSmramRanges[Index].CpuStart) && (Buffer < mSmmMemLibInternalSmramRanges[Index].CpuStart + mSmmMemLibInternalSmramRanges[Index].PhysicalSize)) ||
((mSmmMemLibInternalSmramRanges[Index].CpuStart >= Buffer) && (mSmmMemLibInternalSmramRanges[Index].CpuStart < Buffer + Length))) { ((mSmmMemLibInternalSmramRanges[Index].CpuStart >= Buffer) && (mSmmMemLibInternalSmramRanges[Index].CpuStart < Buffer + Length))) {
DEBUG (( DEBUG ((
EFI_D_ERROR, DEBUG_ERROR,
"SmmIsBufferOutsideSmmValid: Overlap: Buffer (0x%lx) - Length (0x%lx), ", "SmmIsBufferOutsideSmmValid: Overlap: Buffer (0x%lx) - Length (0x%lx), ",
Buffer, Buffer,
Length Length
)); ));
DEBUG (( DEBUG ((
EFI_D_ERROR, DEBUG_ERROR,
"CpuStart (0x%lx) - PhysicalSize (0x%lx)\n", "CpuStart (0x%lx) - PhysicalSize (0x%lx)\n",
mSmmMemLibInternalSmramRanges[Index].CpuStart, mSmmMemLibInternalSmramRanges[Index].CpuStart,
mSmmMemLibInternalSmramRanges[Index].PhysicalSize mSmmMemLibInternalSmramRanges[Index].PhysicalSize
@ -176,7 +176,7 @@ SmmIsBufferOutsideSmmValid (
if (!InValidCommunicationRegion) { if (!InValidCommunicationRegion) {
DEBUG (( DEBUG ((
EFI_D_ERROR, DEBUG_ERROR,
"SmmIsBufferOutsideSmmValid: Not in ValidCommunicationRegion: Buffer (0x%lx) - Length (0x%lx)\n", "SmmIsBufferOutsideSmmValid: Not in ValidCommunicationRegion: Buffer (0x%lx) - Length (0x%lx)\n",
Buffer, Buffer,
Length Length
@ -191,7 +191,7 @@ SmmIsBufferOutsideSmmValid (
if (((Buffer >= mSmmMemLibGcdMemSpace[Index].BaseAddress) && (Buffer < mSmmMemLibGcdMemSpace[Index].BaseAddress + mSmmMemLibGcdMemSpace[Index].Length)) || if (((Buffer >= mSmmMemLibGcdMemSpace[Index].BaseAddress) && (Buffer < mSmmMemLibGcdMemSpace[Index].BaseAddress + mSmmMemLibGcdMemSpace[Index].Length)) ||
((mSmmMemLibGcdMemSpace[Index].BaseAddress >= Buffer) && (mSmmMemLibGcdMemSpace[Index].BaseAddress < Buffer + Length))) { ((mSmmMemLibGcdMemSpace[Index].BaseAddress >= Buffer) && (mSmmMemLibGcdMemSpace[Index].BaseAddress < Buffer + Length))) {
DEBUG (( DEBUG ((
EFI_D_ERROR, DEBUG_ERROR,
"SmmIsBufferOutsideSmmValid: In Untested Memory Region: Buffer (0x%lx) - Length (0x%lx)\n", "SmmIsBufferOutsideSmmValid: In Untested Memory Region: Buffer (0x%lx) - Length (0x%lx)\n",
Buffer, Buffer,
Length Length
@ -213,7 +213,7 @@ SmmIsBufferOutsideSmmValid (
if (((Buffer >= Entry->PhysicalStart) && (Buffer < Entry->PhysicalStart + LShiftU64 (Entry->NumberOfPages, EFI_PAGE_SHIFT))) || if (((Buffer >= Entry->PhysicalStart) && (Buffer < Entry->PhysicalStart + LShiftU64 (Entry->NumberOfPages, EFI_PAGE_SHIFT))) ||
((Entry->PhysicalStart >= Buffer) && (Entry->PhysicalStart < Buffer + Length))) { ((Entry->PhysicalStart >= Buffer) && (Entry->PhysicalStart < Buffer + Length))) {
DEBUG (( DEBUG ((
EFI_D_ERROR, DEBUG_ERROR,
"SmmIsBufferOutsideSmmValid: In RuntimeCode Region: Buffer (0x%lx) - Length (0x%lx)\n", "SmmIsBufferOutsideSmmValid: In RuntimeCode Region: Buffer (0x%lx) - Length (0x%lx)\n",
Buffer, Buffer,
Length Length
@ -255,7 +255,7 @@ SmmCopyMemToSmram (
) )
{ {
if (!SmmIsBufferOutsideSmmValid ((EFI_PHYSICAL_ADDRESS)(UINTN)SourceBuffer, Length)) { if (!SmmIsBufferOutsideSmmValid ((EFI_PHYSICAL_ADDRESS)(UINTN)SourceBuffer, Length)) {
DEBUG ((EFI_D_ERROR, "SmmCopyMemToSmram: Security Violation: Source (0x%x), Length (0x%x)\n", SourceBuffer, Length)); DEBUG ((DEBUG_ERROR, "SmmCopyMemToSmram: Security Violation: Source (0x%x), Length (0x%x)\n", SourceBuffer, Length));
return EFI_SECURITY_VIOLATION; return EFI_SECURITY_VIOLATION;
} }
CopyMem (DestinationBuffer, SourceBuffer, Length); CopyMem (DestinationBuffer, SourceBuffer, Length);
@ -288,7 +288,7 @@ SmmCopyMemFromSmram (
) )
{ {
if (!SmmIsBufferOutsideSmmValid ((EFI_PHYSICAL_ADDRESS)(UINTN)DestinationBuffer, Length)) { if (!SmmIsBufferOutsideSmmValid ((EFI_PHYSICAL_ADDRESS)(UINTN)DestinationBuffer, Length)) {
DEBUG ((EFI_D_ERROR, "SmmCopyMemFromSmram: Security Violation: Destination (0x%x), Length (0x%x)\n", DestinationBuffer, Length)); DEBUG ((DEBUG_ERROR, "SmmCopyMemFromSmram: Security Violation: Destination (0x%x), Length (0x%x)\n", DestinationBuffer, Length));
return EFI_SECURITY_VIOLATION; return EFI_SECURITY_VIOLATION;
} }
CopyMem (DestinationBuffer, SourceBuffer, Length); CopyMem (DestinationBuffer, SourceBuffer, Length);
@ -322,11 +322,11 @@ SmmCopyMem (
) )
{ {
if (!SmmIsBufferOutsideSmmValid ((EFI_PHYSICAL_ADDRESS)(UINTN)DestinationBuffer, Length)) { if (!SmmIsBufferOutsideSmmValid ((EFI_PHYSICAL_ADDRESS)(UINTN)DestinationBuffer, Length)) {
DEBUG ((EFI_D_ERROR, "SmmCopyMem: Security Violation: Destination (0x%x), Length (0x%x)\n", DestinationBuffer, Length)); DEBUG ((DEBUG_ERROR, "SmmCopyMem: Security Violation: Destination (0x%x), Length (0x%x)\n", DestinationBuffer, Length));
return EFI_SECURITY_VIOLATION; return EFI_SECURITY_VIOLATION;
} }
if (!SmmIsBufferOutsideSmmValid ((EFI_PHYSICAL_ADDRESS)(UINTN)SourceBuffer, Length)) { if (!SmmIsBufferOutsideSmmValid ((EFI_PHYSICAL_ADDRESS)(UINTN)SourceBuffer, Length)) {
DEBUG ((EFI_D_ERROR, "SmmCopyMem: Security Violation: Source (0x%x), Length (0x%x)\n", SourceBuffer, Length)); DEBUG ((DEBUG_ERROR, "SmmCopyMem: Security Violation: Source (0x%x), Length (0x%x)\n", SourceBuffer, Length));
return EFI_SECURITY_VIOLATION; return EFI_SECURITY_VIOLATION;
} }
CopyMem (DestinationBuffer, SourceBuffer, Length); CopyMem (DestinationBuffer, SourceBuffer, Length);
@ -358,7 +358,7 @@ SmmSetMem (
) )
{ {
if (!SmmIsBufferOutsideSmmValid ((EFI_PHYSICAL_ADDRESS)(UINTN)Buffer, Length)) { if (!SmmIsBufferOutsideSmmValid ((EFI_PHYSICAL_ADDRESS)(UINTN)Buffer, Length)) {
DEBUG ((EFI_D_ERROR, "SmmSetMem: Security Violation: Source (0x%x), Length (0x%x)\n", Buffer, Length)); DEBUG ((DEBUG_ERROR, "SmmSetMem: Security Violation: Source (0x%x), Length (0x%x)\n", Buffer, Length));
return EFI_SECURITY_VIOLATION; return EFI_SECURITY_VIOLATION;
} }
SetMem (Buffer, Length, Value); SetMem (Buffer, Length, Value);

5
MdePkg/Library/UefiLib/UefiNotTiano.c
View File

@ -80,7 +80,7 @@ EfiCreateEventLegacyBootEx (
ASSERT (LegacyBootEvent != NULL); ASSERT (LegacyBootEvent != NULL);
if (gST->Hdr.Revision < EFI_2_00_SYSTEM_TABLE_REVISION) { if (gST->Hdr.Revision < EFI_2_00_SYSTEM_TABLE_REVISION) {
DEBUG ((EFI_D_ERROR, "EFI1.1 can't support LegacyBootEvent!")); DEBUG ((DEBUG_ERROR, "EFI1.1 can't support LegacyBootEvent!"));
ASSERT (FALSE); ASSERT (FALSE);
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
@ -175,7 +175,7 @@ EfiCreateEventReadyToBootEx (
ASSERT (ReadyToBootEvent != NULL); ASSERT (ReadyToBootEvent != NULL);
if (gST->Hdr.Revision < EFI_2_00_SYSTEM_TABLE_REVISION) { if (gST->Hdr.Revision < EFI_2_00_SYSTEM_TABLE_REVISION) {
DEBUG ((EFI_D_ERROR, "EFI1.1 can't support ReadyToBootEvent!")); DEBUG ((DEBUG_ERROR, "EFI1.1 can't support ReadyToBootEvent!"));
ASSERT (FALSE); ASSERT (FALSE);
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
@ -327,4 +327,3 @@ EfiInitializeFwVolDevicepathNode (
CopyGuid (&FvDevicePathNode->FvFileName, NameGuid); CopyGuid (&FvDevicePathNode->FvFileName, NameGuid);
} }