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

OvmfPkg: 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: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Michael D Kinney 2021-11-16 19:21:33 -08:00 committed by mergify[bot]
parent c49ca4a29e
commit 47719926e8
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
View File

@ -121,7 +121,7 @@ ProcessPciHost (
Status = FdtClient->FindCompatibleNode (FdtClient, "pci-host-ecam-generic", Status = FdtClient->FindCompatibleNode (FdtClient, "pci-host-ecam-generic",
&Node); &Node);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_INFO, DEBUG ((DEBUG_INFO,
"%a: No 'pci-host-ecam-generic' compatible DT node found\n", "%a: No 'pci-host-ecam-generic' compatible DT node found\n",
__FUNCTION__)); __FUNCTION__));
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
@ -141,7 +141,7 @@ ProcessPciHost (
Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg", &Prop, &Len); Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg", &Prop, &Len);
if (EFI_ERROR (Status) || Len != 2 * sizeof (UINT64)) { if (EFI_ERROR (Status) || Len != 2 * sizeof (UINT64)) {
DEBUG ((EFI_D_ERROR, "%a: 'reg' property not found or invalid\n", DEBUG ((DEBUG_ERROR, "%a: 'reg' property not found or invalid\n",
__FUNCTION__)); __FUNCTION__));
return EFI_PROTOCOL_ERROR; return EFI_PROTOCOL_ERROR;
} }
@ -158,7 +158,7 @@ ProcessPciHost (
Status = FdtClient->GetNodeProperty (FdtClient, Node, "bus-range", &Prop, Status = FdtClient->GetNodeProperty (FdtClient, Node, "bus-range", &Prop,
&Len); &Len);
if (EFI_ERROR (Status) || Len != 2 * sizeof (UINT32)) { if (EFI_ERROR (Status) || Len != 2 * sizeof (UINT32)) {
DEBUG ((EFI_D_ERROR, "%a: 'bus-range' not found or invalid\n", DEBUG ((DEBUG_ERROR, "%a: 'bus-range' not found or invalid\n",
__FUNCTION__)); __FUNCTION__));
return EFI_PROTOCOL_ERROR; return EFI_PROTOCOL_ERROR;
} }
@ -171,7 +171,7 @@ ProcessPciHost (
// //
if (*BusMax < *BusMin || *BusMax - *BusMin == MAX_UINT32 || if (*BusMax < *BusMin || *BusMax - *BusMin == MAX_UINT32 ||
DivU64x32 (ConfigSize, SIZE_4KB * 8 * 32) < *BusMax - *BusMin + 1) { DivU64x32 (ConfigSize, SIZE_4KB * 8 * 32) < *BusMax - *BusMin + 1) {
DEBUG ((EFI_D_ERROR, "%a: invalid 'bus-range' and/or 'reg'\n", DEBUG ((DEBUG_ERROR, "%a: invalid 'bus-range' and/or 'reg'\n",
__FUNCTION__)); __FUNCTION__));
return EFI_PROTOCOL_ERROR; return EFI_PROTOCOL_ERROR;
} }
@ -182,7 +182,7 @@ ProcessPciHost (
Status = FdtClient->GetNodeProperty (FdtClient, Node, "ranges", &Prop, &Len); Status = FdtClient->GetNodeProperty (FdtClient, Node, "ranges", &Prop, &Len);
if (EFI_ERROR (Status) || Len == 0 || if (EFI_ERROR (Status) || Len == 0 ||
Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) { Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) {
DEBUG ((EFI_D_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__));
return EFI_PROTOCOL_ERROR; return EFI_PROTOCOL_ERROR;
} }
@ -207,14 +207,14 @@ ProcessPciHost (
if (*Mmio32Base > MAX_UINT32 || *Mmio32Size > MAX_UINT32 || if (*Mmio32Base > MAX_UINT32 || *Mmio32Size > MAX_UINT32 ||
*Mmio32Base + *Mmio32Size > SIZE_4GB) { *Mmio32Base + *Mmio32Size > SIZE_4GB) {
DEBUG ((EFI_D_ERROR, "%a: MMIO32 space invalid\n", __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a: MMIO32 space invalid\n", __FUNCTION__));
return EFI_PROTOCOL_ERROR; return EFI_PROTOCOL_ERROR;
} }
ASSERT (PcdGet64 (PcdPciMmio32Translation) == Mmio32Translation); ASSERT (PcdGet64 (PcdPciMmio32Translation) == Mmio32Translation);
if (Mmio32Translation != 0) { if (Mmio32Translation != 0) {
DEBUG ((EFI_D_ERROR, "%a: unsupported nonzero MMIO32 translation " DEBUG ((DEBUG_ERROR, "%a: unsupported nonzero MMIO32 translation "
"0x%Lx\n", __FUNCTION__, Mmio32Translation)); "0x%Lx\n", __FUNCTION__, Mmio32Translation));
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -229,7 +229,7 @@ ProcessPciHost (
ASSERT (PcdGet64 (PcdPciMmio64Translation) == Mmio64Translation); ASSERT (PcdGet64 (PcdPciMmio64Translation) == Mmio64Translation);
if (Mmio64Translation != 0) { if (Mmio64Translation != 0) {
DEBUG ((EFI_D_ERROR, "%a: unsupported nonzero MMIO64 translation " DEBUG ((DEBUG_ERROR, "%a: unsupported nonzero MMIO64 translation "
"0x%Lx\n", __FUNCTION__, Mmio64Translation)); "0x%Lx\n", __FUNCTION__, Mmio64Translation));
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -238,7 +238,7 @@ ProcessPciHost (
} }
} }
if (*IoSize == 0 || *Mmio32Size == 0) { if (*IoSize == 0 || *Mmio32Size == 0) {
DEBUG ((EFI_D_ERROR, "%a: %a space empty\n", __FUNCTION__, DEBUG ((DEBUG_ERROR, "%a: %a space empty\n", __FUNCTION__,
(*IoSize == 0) ? "IO" : "MMIO32")); (*IoSize == 0) ? "IO" : "MMIO32"));
return EFI_PROTOCOL_ERROR; return EFI_PROTOCOL_ERROR;
} }
@ -249,7 +249,7 @@ ProcessPciHost (
// //
ASSERT (PcdGet64 (PcdPciExpressBaseAddress) == ConfigBase); ASSERT (PcdGet64 (PcdPciExpressBaseAddress) == ConfigBase);
DEBUG ((EFI_D_INFO, "%a: Config[0x%Lx+0x%Lx) Bus[0x%x..0x%x] " DEBUG ((DEBUG_INFO, "%a: Config[0x%Lx+0x%Lx) Bus[0x%x..0x%x] "
"Io[0x%Lx+0x%Lx)@0x%Lx Mem32[0x%Lx+0x%Lx)@0x0 Mem64[0x%Lx+0x%Lx)@0x0\n", "Io[0x%Lx+0x%Lx)@0x%Lx Mem32[0x%Lx+0x%Lx)@0x0 Mem64[0x%Lx+0x%Lx)@0x0\n",
__FUNCTION__, ConfigBase, ConfigSize, *BusMin, *BusMax, *IoBase, *IoSize, __FUNCTION__, ConfigBase, ConfigSize, *BusMin, *BusMax, *IoBase, *IoSize,
IoTranslation, *Mmio32Base, *Mmio32Size, *Mmio64Base, *Mmio64Size)); IoTranslation, *Mmio32Base, *Mmio32Size, *Mmio64Base, *Mmio64Size));
@ -301,7 +301,7 @@ PciHostBridgeGetRootBridges (
PCI_ROOT_BRIDGE_APERTURE PMemAbove4G; PCI_ROOT_BRIDGE_APERTURE PMemAbove4G;
if (PcdGet64 (PcdPciExpressBaseAddress) == 0) { if (PcdGet64 (PcdPciExpressBaseAddress) == 0) {
DEBUG ((EFI_D_INFO, "%a: PCI host bridge not present\n", __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a: PCI host bridge not present\n", __FUNCTION__));
*Count = 0; *Count = 0;
return NULL; return NULL;
@ -310,7 +310,7 @@ PciHostBridgeGetRootBridges (
Status = ProcessPciHost (&IoBase, &IoSize, &Mmio32Base, &Mmio32Size, Status = ProcessPciHost (&IoBase, &IoSize, &Mmio32Base, &Mmio32Size,
&Mmio64Base, &Mmio64Size, &BusMin, &BusMax); &Mmio64Base, &Mmio64Size, &BusMin, &BusMax);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "%a: failed to discover PCI host bridge: %r\n", DEBUG ((DEBUG_ERROR, "%a: failed to discover PCI host bridge: %r\n",
__FUNCTION__, Status)); __FUNCTION__, Status));
*Count = 0; *Count = 0;
return NULL; return NULL;

4
OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
View File

@ -57,7 +57,7 @@ GetPciIoTranslation (
Status = FdtClient->GetNodeProperty (FdtClient, Node, "ranges", &Prop, &Len); Status = FdtClient->GetNodeProperty (FdtClient, Node, "ranges", &Prop, &Len);
if (EFI_ERROR (Status) || Len == 0 || if (EFI_ERROR (Status) || Len == 0 ||
Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) { Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) {
DEBUG ((EFI_D_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__));
return RETURN_PROTOCOL_ERROR; return RETURN_PROTOCOL_ERROR;
} }
@ -135,7 +135,7 @@ FdtPciPcdProducerLibConstructor (
// to abort in the general case. So leave it up to the actual driver to // to abort in the general case. So leave it up to the actual driver to
// complain about this if it wants to, and just issue a warning here. // complain about this if it wants to, and just issue a warning here.
// //
DEBUG ((EFI_D_WARN, DEBUG ((DEBUG_WARN,
"%a: 'pci-host-ecam-generic' device encountered with no I/O range\n", "%a: 'pci-host-ecam-generic' device encountered with no I/O range\n",
__FUNCTION__)); __FUNCTION__));
} }

6
OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
View File

@ -80,7 +80,7 @@ InitializeHighMemDxe (
CurSize, EFI_MEMORY_WB); CurSize, EFI_MEMORY_WB);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, DEBUG ((DEBUG_ERROR,
"%a: Failed to add System RAM @ 0x%lx - 0x%lx (%r)\n", "%a: Failed to add System RAM @ 0x%lx - 0x%lx (%r)\n",
__FUNCTION__, CurBase, CurBase + CurSize - 1, Status)); __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));
continue; continue;
@ -114,11 +114,11 @@ InitializeHighMemDxe (
Status = Cpu->SetMemoryAttributes (Cpu, CurBase, CurSize, Attributes); Status = Cpu->SetMemoryAttributes (Cpu, CurBase, CurSize, Attributes);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, DEBUG ((DEBUG_ERROR,
"%a: Failed to set System RAM @ 0x%lx - 0x%lx attribute (%r)\n", "%a: Failed to set System RAM @ 0x%lx - 0x%lx attribute (%r)\n",
__FUNCTION__, CurBase, CurBase + CurSize - 1, Status)); __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));
} else { } else {
DEBUG ((EFI_D_INFO, "%a: Add System RAM @ 0x%lx - 0x%lx\n", DEBUG ((DEBUG_INFO, "%a: Add System RAM @ 0x%lx - 0x%lx\n",
__FUNCTION__, CurBase, CurBase + CurSize - 1)); __FUNCTION__, CurBase, CurBase + CurSize - 1));
} }
} }

10
OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c
View File

@ -57,7 +57,7 @@ InitializeVirtioFdtDxe (
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_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n", DEBUG ((DEBUG_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n",
__FUNCTION__, Status)); __FUNCTION__, Status));
continue; continue;
} }
@ -73,7 +73,7 @@ InitializeVirtioFdtDxe (
HW_VENDOR_DP, HW_VENDOR_DP,
sizeof (VIRTIO_TRANSPORT_DEVICE_PATH)); sizeof (VIRTIO_TRANSPORT_DEVICE_PATH));
if (DevicePath == NULL) { if (DevicePath == NULL) {
DEBUG ((EFI_D_ERROR, "%a: Out of memory\n", __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a: Out of memory\n", __FUNCTION__));
continue; continue;
} }
@ -88,7 +88,7 @@ InitializeVirtioFdtDxe (
&gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE, &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE,
DevicePath); DevicePath);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "%a: Failed to install the EFI_DEVICE_PATH " DEBUG ((DEBUG_ERROR, "%a: Failed to install the EFI_DEVICE_PATH "
"protocol on a new handle (Status == %r)\n", "protocol on a new handle (Status == %r)\n",
__FUNCTION__, Status)); __FUNCTION__, Status));
FreePool (DevicePath); FreePool (DevicePath);
@ -97,7 +97,7 @@ InitializeVirtioFdtDxe (
Status = VirtioMmioInstallDevice (RegBase, Handle); Status = VirtioMmioInstallDevice (RegBase, Handle);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "%a: Failed to install VirtIO transport @ 0x%Lx " DEBUG ((DEBUG_ERROR, "%a: Failed to install VirtIO transport @ 0x%Lx "
"on handle %p (Status == %r)\n", __FUNCTION__, RegBase, "on handle %p (Status == %r)\n", __FUNCTION__, RegBase,
Handle, Status)); Handle, Status));
@ -110,7 +110,7 @@ InitializeVirtioFdtDxe (
} }
if (EFI_ERROR (FindNodeStatus) && FindNodeStatus != EFI_NOT_FOUND) { if (EFI_ERROR (FindNodeStatus) && FindNodeStatus != EFI_NOT_FOUND) {
DEBUG ((EFI_D_ERROR, "%a: Error occurred while iterating DT nodes " DEBUG ((DEBUG_ERROR, "%a: Error occurred while iterating DT nodes "
"(FindNodeStatus == %r)\n", __FUNCTION__, FindNodeStatus)); "(FindNodeStatus == %r)\n", __FUNCTION__, FindNodeStatus));
} }

2
OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
View File

@ -253,7 +253,7 @@ RemoveStaleFvFileOptions (
DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath, DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,
FALSE, FALSE); FALSE, FALSE);
DEBUG (( DEBUG ((
EFI_ERROR (Status) ? EFI_D_WARN : DEBUG_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,

6
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c
View File

@ -125,7 +125,7 @@ QemuFwCfgInitialize (
(CONST VOID **)&Reg, &AddressCells, &SizeCells, (CONST VOID **)&Reg, &AddressCells, &SizeCells,
&RegSize); &RegSize);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_WARN, DEBUG ((DEBUG_WARN,
"%a: No 'qemu,fw-cfg-mmio' compatible DT node found (Status == %r)\n", "%a: No 'qemu,fw-cfg-mmio' compatible DT node found (Status == %r)\n",
__FUNCTION__, Status)); __FUNCTION__, Status));
return EFI_SUCCESS; return EFI_SUCCESS;
@ -156,7 +156,7 @@ QemuFwCfgInitialize (
mFwCfgSelectorAddress = FwCfgSelectorAddress; mFwCfgSelectorAddress = FwCfgSelectorAddress;
mFwCfgDataAddress = FwCfgDataAddress; mFwCfgDataAddress = FwCfgDataAddress;
DEBUG ((EFI_D_INFO, "Found FwCfg @ 0x%Lx/0x%Lx\n", FwCfgSelectorAddress, DEBUG ((DEBUG_INFO, "Found FwCfg @ 0x%Lx/0x%Lx\n", FwCfgSelectorAddress,
FwCfgDataAddress)); FwCfgDataAddress));
if (SwapBytes64 (Reg[1]) >= 0x18) { if (SwapBytes64 (Reg[1]) >= 0x18) {
@ -168,7 +168,7 @@ QemuFwCfgInitialize (
// //
ASSERT (FwCfgDmaAddress <= MAX_UINTN - FwCfgDmaSize + 1); ASSERT (FwCfgDmaAddress <= MAX_UINTN - FwCfgDmaSize + 1);
DEBUG ((EFI_D_INFO, "Found FwCfg DMA @ 0x%Lx\n", FwCfgDmaAddress)); DEBUG ((DEBUG_INFO, "Found FwCfg DMA @ 0x%Lx\n", FwCfgDmaAddress));
} else { } else {
FwCfgDmaAddress = 0; FwCfgDmaAddress = 0;
} }