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 <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>

diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
index 5448865ad8e81b8edac21bd5eb34eb18703fad6a..46e5b3f3e1aa2aabf5755d39149dbd6498576730 100644 (file)
--- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
+++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
@@ -85,7 +85,7 @@ ArmVirtGicArchLibConstructor (
     PcdStatus = PcdSet64S (PcdGicRedistributorsBase, RedistBase);\r
     ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
-    DEBUG ((EFI_D_INFO, "Found GIC v3 (re)distributor @ 0x%Lx (0x%Lx)\n",\r
+    DEBUG ((DEBUG_INFO, "Found GIC v3 (re)distributor @ 0x%Lx (0x%Lx)\n",\r
       DistBase, RedistBase));\r
 \r
     //\r
@@ -127,13 +127,13 @@ ArmVirtGicArchLibConstructor (
     PcdStatus = PcdSet64S (PcdGicInterruptInterfaceBase, CpuBase);\r
     ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
-    DEBUG ((EFI_D_INFO, "Found GIC @ 0x%Lx/0x%Lx\n", DistBase, CpuBase));\r
+    DEBUG ((DEBUG_INFO, "Found GIC @ 0x%Lx/0x%Lx\n", DistBase, CpuBase));\r
 \r
     mGicArchRevision = ARM_GIC_ARCH_REVISION_2;\r
     break;\r
 \r
   default:\r
-    DEBUG ((EFI_D_ERROR, "%a: No GIC revision specified!\n", __FUNCTION__));\r
+    DEBUG ((DEBUG_ERROR, "%a: No GIC revision specified!\n", __FUNCTION__));\r
     return RETURN_NOT_FOUND;\r
   }\r
   return RETURN_SUCCESS;\r

diff --git a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c
index 13f3ccc51816b5e128f59430b658730ec44e41d7..4946fad77adf74a10772ecf6a33e0dfab95c7ed2 100644 (file)
--- 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)\r
   Status = ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Error: Failed to enable MMU\n"));\r
+    DEBUG ((DEBUG_ERROR, "Error: Failed to enable MMU\n"));\r
   }\r
 }\r
 \r

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

diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
index 9e5b70e2c54c630639481b003710c413eceb30af..419ed7d50f6b81d4a699c3801b6fcae1878e2507 100644 (file)
--- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
+++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
@@ -54,7 +54,7 @@ ArmPsciResetSystemLibConstructor (
   } else if (AsciiStrnCmp (Prop, "smc", 3) == 0) {\r
     mArmPsciMethod = 2;\r
   } else {\r
-    DEBUG ((EFI_D_ERROR, "%a: Unknown PSCI method \"%a\"\n", __FUNCTION__,\r
+    DEBUG ((DEBUG_ERROR, "%a: Unknown PSCI method \"%a\"\n", __FUNCTION__,\r
       Prop));\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -92,7 +92,7 @@ ResetCold (
     break;\r
 \r
   default:\r
-    DEBUG ((EFI_D_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));\r
+    DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));\r
   }\r
 }\r
 \r
@@ -141,7 +141,7 @@ ResetShutdown (
     break;\r
 \r
   default:\r
-    DEBUG ((EFI_D_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));\r
+    DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));\r
   }\r
 }\r
 \r

diff --git a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.c
index a60212c6229c1210c2ba43b1ecbf92299769e3a6..35d61feefc8f7408c746e96119638f98eac1ebb2 100644 (file)
--- 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)\r
                                    + (InterruptProp[3].Type ? 16 : 0);\r
 \r
-  DEBUG ((EFI_D_INFO, "Found Timer interrupts %d, %d, %d, %d\n",\r
+  DEBUG ((DEBUG_INFO, "Found Timer interrupts %d, %d, %d, %d\n",\r
     SecIntrNum, IntrNum, VirtIntrNum, HypIntrNum));\r
 \r
   PcdStatus = PcdSet32S (PcdArmArchTimerSecIntrNum, SecIntrNum);\r

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

diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c
index 6c4028e179955d896f7624b93b1ea7f27266b19e..83f346157f7ef5e5fb8967505abbd64893bd0587 100644 (file)
--- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c
+++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c
@@ -111,7 +111,7 @@ PlatformPeim (
 \r
         UartBase = fdt64_to_cpu (ReadUnaligned64 (RegProp));\r
 \r
-        DEBUG ((EFI_D_INFO, "%a: PL011 UART @ 0x%lx\n", __FUNCTION__, UartBase));\r
+        DEBUG ((DEBUG_INFO, "%a: PL011 UART @ 0x%lx\n", __FUNCTION__, UartBase));\r
 \r
         *UartHobData = UartBase;\r
         break;\r

diff --git a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c
index df25f3a4c672bf34134a52fd921610c6c207aab1..438b0ff0f0e2e2b4c74470b80d8ffbbdcc296c9f 100644 (file)
--- a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c
+++ b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c
@@ -57,7 +57,7 @@ GetXenArmAcpiRsdp (
                         (CONST VOID **)&Reg, &AddressCells, &SizeCells,\r
                         &RegSize);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_WARN, "%a: No 'xen,guest-acpi' compatible DT node found\n",\r
+    DEBUG ((DEBUG_WARN, "%a: No 'xen,guest-acpi' compatible DT node found\n",\r
       __FUNCTION__));\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -127,7 +127,7 @@ InstallXenArmTables (
   //\r
   Status = GetXenArmAcpiRsdp (&XenAcpiRsdpStructurePtr);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_INFO, "%a: No RSDP table found\n", __FUNCTION__));\r
+    DEBUG ((DEBUG_INFO, "%a: No RSDP table found\n", __FUNCTION__));\r
     return Status;\r
   }\r
 \r

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