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

ArmVirtPkg: 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: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Michael D Kinney 2021-11-16 19:21:15 -08:00 committed by mergify[bot]
parent 1d2482e1e3
commit c5b3a56e4f
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
View File

@ -85,7 +85,7 @@ ArmVirtGicArchLibConstructor (
PcdStatus = PcdSet64S (PcdGicRedistributorsBase, RedistBase); PcdStatus = PcdSet64S (PcdGicRedistributorsBase, RedistBase);
ASSERT_RETURN_ERROR (PcdStatus); ASSERT_RETURN_ERROR (PcdStatus);
DEBUG ((EFI_D_INFO, "Found GIC v3 (re)distributor @ 0x%Lx (0x%Lx)\n", DEBUG ((DEBUG_INFO, "Found GIC v3 (re)distributor @ 0x%Lx (0x%Lx)\n",
DistBase, RedistBase)); DistBase, RedistBase));
// //
@ -127,13 +127,13 @@ ArmVirtGicArchLibConstructor (
PcdStatus = PcdSet64S (PcdGicInterruptInterfaceBase, CpuBase); PcdStatus = PcdSet64S (PcdGicInterruptInterfaceBase, CpuBase);
ASSERT_RETURN_ERROR (PcdStatus); ASSERT_RETURN_ERROR (PcdStatus);
DEBUG ((EFI_D_INFO, "Found GIC @ 0x%Lx/0x%Lx\n", DistBase, CpuBase)); DEBUG ((DEBUG_INFO, "Found GIC @ 0x%Lx/0x%Lx\n", DistBase, CpuBase));
mGicArchRevision = ARM_GIC_ARCH_REVISION_2; mGicArchRevision = ARM_GIC_ARCH_REVISION_2;
break; break;
default: default:
DEBUG ((EFI_D_ERROR, "%a: No GIC revision specified!\n", __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a: No GIC revision specified!\n", __FUNCTION__));
return RETURN_NOT_FOUND; return RETURN_NOT_FOUND;
} }
return RETURN_SUCCESS; return RETURN_SUCCESS;

2
ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c
View File

@ -39,7 +39,7 @@ InitMmu (
// DRAM (even at the top of DRAM as it is the first permanent memory allocation) // DRAM (even at the top of DRAM as it is the first permanent memory allocation)
Status = ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize); Status = ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "Error: Failed to enable MMU\n")); DEBUG ((DEBUG_ERROR, "Error: Failed to enable MMU\n"));
} }
} }

8
ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c
View File

@ -36,7 +36,7 @@ ArmVirtPL031FdtClientLibConstructor (
Status = FdtClient->FindCompatibleNode (FdtClient, "arm,pl031", &Node); Status = FdtClient->FindCompatibleNode (FdtClient, "arm,pl031", &Node);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_WARN, "%a: No 'arm,pl031' compatible DT node found\n", DEBUG ((DEBUG_WARN, "%a: No 'arm,pl031' compatible DT node found\n",
__FUNCTION__)); __FUNCTION__));
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -44,7 +44,7 @@ ArmVirtPL031FdtClientLibConstructor (
Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg", Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg",
(CONST VOID **)&Reg, &RegSize); (CONST VOID **)&Reg, &RegSize);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_WARN, DEBUG ((DEBUG_WARN,
"%a: No 'reg' property found in 'arm,pl031' compatible DT node\n", "%a: No 'reg' property found in 'arm,pl031' compatible DT node\n",
__FUNCTION__)); __FUNCTION__));
return EFI_SUCCESS; return EFI_SUCCESS;
@ -58,7 +58,7 @@ ArmVirtPL031FdtClientLibConstructor (
PcdStatus = PcdSet32S (PcdPL031RtcBase, (UINT32)RegBase); PcdStatus = PcdSet32S (PcdPL031RtcBase, (UINT32)RegBase);
ASSERT_RETURN_ERROR (PcdStatus); ASSERT_RETURN_ERROR (PcdStatus);
DEBUG ((EFI_D_INFO, "Found PL031 RTC @ 0x%Lx\n", RegBase)); DEBUG ((DEBUG_INFO, "Found PL031 RTC @ 0x%Lx\n", RegBase));
// //
// UEFI takes ownership of the RTC hardware, and exposes its functionality // UEFI takes ownership of the RTC hardware, and exposes its functionality
@ -69,7 +69,7 @@ ArmVirtPL031FdtClientLibConstructor (
Status = FdtClient->SetNodeProperty (FdtClient, Node, "status", Status = FdtClient->SetNodeProperty (FdtClient, Node, "status",
"disabled", sizeof ("disabled")); "disabled", sizeof ("disabled"));
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_WARN, "Failed to set PL031 status to 'disabled'\n")); DEBUG ((DEBUG_WARN, "Failed to set PL031 status to 'disabled'\n"));
} }
return EFI_SUCCESS; return EFI_SUCCESS;

6
ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
View File

@ -54,7 +54,7 @@ ArmPsciResetSystemLibConstructor (
} else if (AsciiStrnCmp (Prop, "smc", 3) == 0) { } else if (AsciiStrnCmp (Prop, "smc", 3) == 0) {
mArmPsciMethod = 2; mArmPsciMethod = 2;
} else { } else {
DEBUG ((EFI_D_ERROR, "%a: Unknown PSCI method \"%a\"\n", __FUNCTION__, DEBUG ((DEBUG_ERROR, "%a: Unknown PSCI method \"%a\"\n", __FUNCTION__,
Prop)); Prop));
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
@ -92,7 +92,7 @@ ResetCold (
break; break;
default: default:
DEBUG ((EFI_D_ERROR, "%a: no PSCI method defined\n", __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));
} }
} }
@ -141,7 +141,7 @@ ResetShutdown (
break; break;
default: default:
DEBUG ((EFI_D_ERROR, "%a: no PSCI method defined\n", __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));
} }
} }

2
ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c
View File

@ -70,7 +70,7 @@ ArmVirtTimerFdtClientLibConstructor (
HypIntrNum = PropSize < 48 ? 0 : SwapBytes32 (InterruptProp[3].Number) HypIntrNum = PropSize < 48 ? 0 : SwapBytes32 (InterruptProp[3].Number)
+ (InterruptProp[3].Type ? 16 : 0); + (InterruptProp[3].Type ? 16 : 0);
DEBUG ((EFI_D_INFO, "Found Timer interrupts %d, %d, %d, %d\n", DEBUG ((DEBUG_INFO, "Found Timer interrupts %d, %d, %d, %d\n",
SecIntrNum, IntrNum, VirtIntrNum, HypIntrNum)); SecIntrNum, IntrNum, VirtIntrNum, HypIntrNum));
PcdStatus = PcdSet32S (PcdArmArchTimerSecIntrNum, SecIntrNum); PcdStatus = PcdSet32S (PcdArmArchTimerSecIntrNum, SecIntrNum);

16
ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
View File

@ -186,7 +186,7 @@ FilterAndProcess (
// //
// This is not an error, just an informative condition. // This is not an error, just an informative condition.
// //
DEBUG ((EFI_D_VERBOSE, "%a: %g: %r\n", __FUNCTION__, ProtocolGuid, DEBUG ((DEBUG_VERBOSE, "%a: %g: %r\n", __FUNCTION__, ProtocolGuid,
Status)); Status));
return; return;
} }
@ -247,7 +247,7 @@ IsPciDisplay (
Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0 /* Offset */, Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0 /* Offset */,
sizeof Pci / sizeof (UINT32), &Pci); sizeof Pci / sizeof (UINT32), &Pci);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status)); DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status));
return FALSE; return FALSE;
} }
@ -390,7 +390,7 @@ Connect (
NULL, // RemainingDevicePath -- produce all children NULL, // RemainingDevicePath -- produce all children
FALSE // Recursive FALSE // Recursive
); );
DEBUG ((EFI_ERROR (Status) ? EFI_D_ERROR : EFI_D_VERBOSE, "%a: %s: %r\n", DEBUG ((EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE, "%a: %s: %r\n",
__FUNCTION__, ReportText, Status)); __FUNCTION__, ReportText, Status));
} }
@ -412,26 +412,26 @@ AddOutput (
DevicePath = DevicePathFromHandle (Handle); DevicePath = DevicePathFromHandle (Handle);
if (DevicePath == NULL) { if (DevicePath == NULL) {
DEBUG ((EFI_D_ERROR, "%a: %s: handle %p: device path not found\n", DEBUG ((DEBUG_ERROR, "%a: %s: handle %p: device path not found\n",
__FUNCTION__, ReportText, Handle)); __FUNCTION__, ReportText, Handle));
return; return;
} }
Status = EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL); Status = EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "%a: %s: adding to ConOut: %r\n", __FUNCTION__, DEBUG ((DEBUG_ERROR, "%a: %s: adding to ConOut: %r\n", __FUNCTION__,
ReportText, Status)); ReportText, Status));
return; return;
} }
Status = EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL); Status = EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "%a: %s: adding to ErrOut: %r\n", __FUNCTION__, DEBUG ((DEBUG_ERROR, "%a: %s: adding to ErrOut: %r\n", __FUNCTION__,
ReportText, Status)); ReportText, Status));
return; return;
} }
DEBUG ((EFI_D_VERBOSE, "%a: %s: added to ConOut and ErrOut\n", __FUNCTION__, DEBUG ((DEBUG_VERBOSE, "%a: %s: added to ConOut and ErrOut\n", __FUNCTION__,
ReportText)); ReportText));
} }
@ -611,7 +611,7 @@ RemoveStaleFvFileOptions (
DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath, DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,
FALSE, FALSE); FALSE, FALSE);
DEBUG (( DEBUG ((
EFI_ERROR (Status) ? EFI_D_WARN : EFI_D_VERBOSE, EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,
"%a: removing stale Boot#%04x %s: %r\n", "%a: removing stale Boot#%04x %s: %r\n",
__FUNCTION__, __FUNCTION__,
(UINT32)BootOptions[Index].OptionNumber, (UINT32)BootOptions[Index].OptionNumber,

2
ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c
View File

@ -111,7 +111,7 @@ PlatformPeim (
UartBase = fdt64_to_cpu (ReadUnaligned64 (RegProp)); UartBase = fdt64_to_cpu (ReadUnaligned64 (RegProp));
DEBUG ((EFI_D_INFO, "%a: PL011 UART @ 0x%lx\n", __FUNCTION__, UartBase)); DEBUG ((DEBUG_INFO, "%a: PL011 UART @ 0x%lx\n", __FUNCTION__, UartBase));
*UartHobData = UartBase; *UartHobData = UartBase;
break; break;

4
ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c
View File

@ -57,7 +57,7 @@ GetXenArmAcpiRsdp (
(CONST VOID **)&Reg, &AddressCells, &SizeCells, (CONST VOID **)&Reg, &AddressCells, &SizeCells,
&RegSize); &RegSize);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_WARN, "%a: No 'xen,guest-acpi' compatible DT node found\n", DEBUG ((DEBUG_WARN, "%a: No 'xen,guest-acpi' compatible DT node found\n",
__FUNCTION__)); __FUNCTION__));
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
@ -127,7 +127,7 @@ InstallXenArmTables (
// //
Status = GetXenArmAcpiRsdp (&XenAcpiRsdpStructurePtr); Status = GetXenArmAcpiRsdp (&XenAcpiRsdpStructurePtr);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_INFO, "%a: No RSDP table found\n", __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a: No RSDP table found\n", __FUNCTION__));
return Status; return Status;
} }

6
ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c
View File

@ -38,7 +38,7 @@ InitializeXenioFdtDxe (
(CONST VOID **)&Reg, &AddressCells, &SizeCells, (CONST VOID **)&Reg, &AddressCells, &SizeCells,
&RegSize); &RegSize);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_WARN, "%a: No 'xen,xen' compatible DT node found\n", DEBUG ((DEBUG_WARN, "%a: No 'xen,xen' compatible DT node found\n",
__FUNCTION__)); __FUNCTION__));
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -55,12 +55,12 @@ InitializeXenioFdtDxe (
Handle = NULL; Handle = NULL;
Status = XenIoMmioInstall (&Handle, RegBase); Status = XenIoMmioInstall (&Handle, RegBase);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "%a: XenIoMmioInstall () failed on a new handle " DEBUG ((DEBUG_ERROR, "%a: XenIoMmioInstall () failed on a new handle "
"(Status == %r)\n", __FUNCTION__, Status)); "(Status == %r)\n", __FUNCTION__, Status));
return Status; return Status;
} }
DEBUG ((EFI_D_INFO, "Found Xen node with Grant table @ 0x%Lx\n", RegBase)); DEBUG ((DEBUG_INFO, "Found Xen node with Grant table @ 0x%Lx\n", RegBase));
return EFI_SUCCESS; return EFI_SUCCESS;
} }