From c5b3a56e4f7e4361997544557511d6b835568193 Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Tue, 16 Nov 2021 19:21:15 -0800 Subject: ArmVirtPkg: Change use of EFI_D_* to DEBUG_* 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 Cc: Leif Lindholm Cc: Michael Kubacki Signed-off-by: Michael D Kinney Reviewed-by: Sami Mujawar Reviewed-by: Ard Biesheuvel --- ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c | 6 +++--- .../ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c | 2 +- .../ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c | 8 ++++---- .../ArmVirtPsciResetSystemLib.c | 6 +++--- .../ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c | 2 +- ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 16 ++++++++-------- ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c | 2 +- ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c | 4 ++-- ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c | 6 +++--- 9 files changed, 26 insertions(+), 26 deletions(-) (limited to 'ArmVirtPkg') diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c index 5448865ad8..46e5b3f3e1 100644 --- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c +++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c @@ -85,7 +85,7 @@ ArmVirtGicArchLibConstructor ( PcdStatus = PcdSet64S (PcdGicRedistributorsBase, RedistBase); 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)); // @@ -127,13 +127,13 @@ ArmVirtGicArchLibConstructor ( PcdStatus = PcdSet64S (PcdGicInterruptInterfaceBase, CpuBase); 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; break; 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_SUCCESS; diff --git a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c index 13f3ccc518..4946fad77a 100644 --- a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c +++ b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c @@ -39,7 +39,7 @@ InitMmu ( // DRAM (even at the top of DRAM as it is the first permanent memory allocation) Status = ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Error: Failed to enable MMU\n")); + DEBUG ((DEBUG_ERROR, "Error: Failed to enable MMU\n")); } } diff --git a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c index 87de25963e..63dc1476a5 100644 --- a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c +++ b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c @@ -36,7 +36,7 @@ ArmVirtPL031FdtClientLibConstructor ( Status = FdtClient->FindCompatibleNode (FdtClient, "arm,pl031", &Node); 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__)); return EFI_SUCCESS; } @@ -44,7 +44,7 @@ ArmVirtPL031FdtClientLibConstructor ( Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg", (CONST VOID **)&Reg, &RegSize); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_WARN, + DEBUG ((DEBUG_WARN, "%a: No 'reg' property found in 'arm,pl031' compatible DT node\n", __FUNCTION__)); return EFI_SUCCESS; @@ -58,7 +58,7 @@ ArmVirtPL031FdtClientLibConstructor ( PcdStatus = PcdSet32S (PcdPL031RtcBase, (UINT32)RegBase); 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 @@ -69,7 +69,7 @@ ArmVirtPL031FdtClientLibConstructor ( Status = FdtClient->SetNodeProperty (FdtClient, Node, "status", "disabled", sizeof ("disabled")); 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; diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c index 9e5b70e2c5..419ed7d50f 100644 --- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c @@ -54,7 +54,7 @@ ArmPsciResetSystemLibConstructor ( } else if (AsciiStrnCmp (Prop, "smc", 3) == 0) { mArmPsciMethod = 2; } else { - DEBUG ((EFI_D_ERROR, "%a: Unknown PSCI method \"%a\"\n", __FUNCTION__, + DEBUG ((DEBUG_ERROR, "%a: Unknown PSCI method \"%a\"\n", __FUNCTION__, Prop)); return EFI_NOT_FOUND; } @@ -92,7 +92,7 @@ ResetCold ( break; 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; default: - DEBUG ((EFI_D_ERROR, "%a: no PSCI method defined\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__)); } } diff --git a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c index a60212c622..35d61feefc 100644 --- a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c +++ b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c @@ -70,7 +70,7 @@ ArmVirtTimerFdtClientLibConstructor ( HypIntrNum = PropSize < 48 ? 0 : SwapBytes32 (InterruptProp[3].Number) + (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)); PcdStatus = PcdSet32S (PcdArmArchTimerSecIntrNum, SecIntrNum); diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c index 1848042f86..bb3140f2d6 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -186,7 +186,7 @@ FilterAndProcess ( // // 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)); return; } @@ -247,7 +247,7 @@ IsPciDisplay ( Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0 /* Offset */, sizeof Pci / sizeof (UINT32), &Pci); 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; } @@ -390,7 +390,7 @@ Connect ( NULL, // RemainingDevicePath -- produce all children 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)); } @@ -412,26 +412,26 @@ AddOutput ( DevicePath = DevicePathFromHandle (Handle); 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)); return; } Status = EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL); 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)); return; } Status = EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL); 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)); 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)); } @@ -611,7 +611,7 @@ RemoveStaleFvFileOptions ( DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath, FALSE, FALSE); 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", __FUNCTION__, (UINT32)BootOptions[Index].OptionNumber, diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c index 6c4028e179..83f346157f 100644 --- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c +++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c @@ -111,7 +111,7 @@ PlatformPeim ( 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; break; diff --git a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c index df25f3a4c6..438b0ff0f0 100644 --- a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c +++ b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c @@ -57,7 +57,7 @@ GetXenArmAcpiRsdp ( (CONST VOID **)&Reg, &AddressCells, &SizeCells, &RegSize); 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__)); return EFI_NOT_FOUND; } @@ -127,7 +127,7 @@ InstallXenArmTables ( // Status = GetXenArmAcpiRsdp (&XenAcpiRsdpStructurePtr); 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; } diff --git a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c index 7451600548..5113c000b2 100644 --- a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c +++ b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c @@ -38,7 +38,7 @@ InitializeXenioFdtDxe ( (CONST VOID **)&Reg, &AddressCells, &SizeCells, &RegSize); 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__)); return EFI_UNSUPPORTED; } @@ -55,12 +55,12 @@ InitializeXenioFdtDxe ( Handle = NULL; Status = XenIoMmioInstall (&Handle, RegBase); 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)); 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; } -- cgit v1.2.3