UefiCpuPkg: 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: Ray Ni <ray.ni@intel.com>

diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.c b/UefiCpuPkg/CpuIoPei/CpuIoPei.c
index 8a24cde0ccfc73597260c54fee7003a31eb6f7f9..98bae46e2970b9597e6c940d3677363dcdd5ea79 100644 (file)
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.c
+++ b/UefiCpuPkg/CpuIoPei/CpuIoPei.c
@@ -900,7 +900,7 @@ CpuIoInitialize (
     //\r
     // Shadow completed and running from memory\r
     //\r
     //\r
     // Shadow completed and running from memory\r
     //\r

-    DEBUG ((EFI_D_INFO, "CpuIO PPI has been loaded into memory.  Reinstalled PPI=0x%x\n", &gCpuIoPpi));\r
+    DEBUG ((DEBUG_INFO, "CpuIO PPI has been loaded into memory.  Reinstalled PPI=0x%x\n", &gCpuIoPpi));\r

   } else {\r
     Status = PeiServicesInstallPpi (&gPpiList);\r
     ASSERT_EFI_ERROR (Status);\r
   } else {\r
     Status = PeiServicesInstallPpi (&gPpiList);\r
     ASSERT_EFI_ERROR (Status);\r

diff --git a/UefiCpuPkg/CpuMpPei/CpuBist.c b/UefiCpuPkg/CpuMpPei/CpuBist.c
index 159fa5cd1fa7d69d867b44d7211078523e9c7bd9..bb35bb434728bd97af9af5537eadb122f88f0ef5 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/CpuBist.c
+++ b/UefiCpuPkg/CpuMpPei/CpuBist.c
@@ -227,7 +227,7 @@ CollectBistDataFromPpi (
       BspCpuInstance.InfoRecord.IA32HealthFlags.Uint32  = SecPlatformInformation->IA32HealthFlags.Uint32;\r
       CpuInstance = &BspCpuInstance;\r
     } else {\r
       BspCpuInstance.InfoRecord.IA32HealthFlags.Uint32  = SecPlatformInformation->IA32HealthFlags.Uint32;\r
       CpuInstance = &BspCpuInstance;\r
     } else {\r

-      DEBUG ((EFI_D_INFO, "Does not find any stored CPU BIST information from PPI!\n"));\r
+      DEBUG ((DEBUG_INFO, "Does not find any stored CPU BIST information from PPI!\n"));\r

     }\r
   }\r
   for (ProcessorNumber = 0; ProcessorNumber < NumberOfProcessors; ProcessorNumber ++) {\r
     }\r
   }\r
   for (ProcessorNumber = 0; ProcessorNumber < NumberOfProcessors; ProcessorNumber ++) {\r


@@ -250,7 +250,7 @@ CollectBistDataFromPpi (
         (EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_SELF_TEST)\r
         );\r
     }\r
         (EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_SELF_TEST)\r
         );\r
     }\r

-    DEBUG ((EFI_D_INFO, "  APICID - 0x%08x, BIST - 0x%08x\n",\r
+    DEBUG ((DEBUG_INFO, "  APICID - 0x%08x, BIST - 0x%08x\n",\r

             (UINT32) ProcessorInfo.ProcessorId,\r
             BistData\r
             ));\r
             (UINT32) ProcessorInfo.ProcessorId,\r
             BistData\r
             ));\r


@@ -288,4 +288,3 @@ CollectBistDataFromPpi (
     ASSERT_EFI_ERROR(Status);\r
   }\r
 }\r
     ASSERT_EFI_ERROR(Status);\r
   }\r
 }\r

-\r

diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c b/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c
index 61ec7c44b217745cf7e80f6b7455d6e90f916390..6100799a79160bed7040a314e93dfa3a1d3d6b6b 100644 (file)
--- a/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c
+++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c
@@ -126,7 +126,7 @@ CpuS3DataOnEndOfDxe (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r

-  DEBUG ((EFI_D_VERBOSE, "%a\n", __FUNCTION__));\r
+  DEBUG ((DEBUG_VERBOSE, "%a\n", __FUNCTION__));\r

   MtrrGetAllMtrrs (&AcpiCpuDataEx->MtrrTable);\r
 \r
   //\r
   MtrrGetAllMtrrs (&AcpiCpuDataEx->MtrrTable);\r
 \r
   //\r

diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c
index 110165b20b4bb715ee3ca422fced778f63591f26..e9e2464be7b89782c4ad7f8741d43507c7785feb 100644 (file)
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c
+++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c
@@ -197,8 +197,8 @@ InternalSmstGetVendorTableByGuid (
     // 32 PEI + 64 DXE\r
     //\r
     Smst64 = (EFI_SMM_SYSTEM_TABLE2_64 *)Smst;\r
     // 32 PEI + 64 DXE\r
     //\r
     Smst64 = (EFI_SMM_SYSTEM_TABLE2_64 *)Smst;\r

-    DEBUG ((EFI_D_INFO, "InitCommunicationContext - SmmConfigurationTable: %x\n", Smst64->SmmConfigurationTable));\r
-    DEBUG ((EFI_D_INFO, "InitCommunicationContext - NumberOfTableEntries: %x\n", Smst64->NumberOfTableEntries));\r
+    DEBUG ((DEBUG_INFO, "InitCommunicationContext - SmmConfigurationTable: %x\n", Smst64->SmmConfigurationTable));\r
+    DEBUG ((DEBUG_INFO, "InitCommunicationContext - NumberOfTableEntries: %x\n", Smst64->NumberOfTableEntries));\r

     SmmConfigurationTable64 = (EFI_CONFIGURATION_TABLE64 *)(UINTN)Smst64->SmmConfigurationTable;\r
     NumberOfTableEntries = (UINTN)Smst64->NumberOfTableEntries;\r
     for (Index = 0; Index < NumberOfTableEntries; Index++) {\r
     SmmConfigurationTable64 = (EFI_CONFIGURATION_TABLE64 *)(UINTN)Smst64->SmmConfigurationTable;\r
     NumberOfTableEntries = (UINTN)Smst64->NumberOfTableEntries;\r
     for (Index = 0; Index < NumberOfTableEntries; Index++) {\r


@@ -208,8 +208,8 @@ InternalSmstGetVendorTableByGuid (
     }\r
     return NULL;\r
   } else {\r
     }\r
     return NULL;\r
   } else {\r

-    DEBUG ((EFI_D_INFO, "InitCommunicationContext - SmmConfigurationTable: %x\n", Smst->SmmConfigurationTable));\r
-    DEBUG ((EFI_D_INFO, "InitCommunicationContext - NumberOfTableEntries: %x\n", Smst->NumberOfTableEntries));\r
+    DEBUG ((DEBUG_INFO, "InitCommunicationContext - SmmConfigurationTable: %x\n", Smst->SmmConfigurationTable));\r
+    DEBUG ((DEBUG_INFO, "InitCommunicationContext - NumberOfTableEntries: %x\n", Smst->NumberOfTableEntries));\r

     SmmConfigurationTable = Smst->SmmConfigurationTable;\r
     NumberOfTableEntries = Smst->NumberOfTableEntries;\r
     for (Index = 0; Index < NumberOfTableEntries; Index++) {\r
     SmmConfigurationTable = Smst->SmmConfigurationTable;\r
     NumberOfTableEntries = Smst->NumberOfTableEntries;\r
     for (Index = 0; Index < NumberOfTableEntries; Index++) {\r


@@ -239,8 +239,8 @@ InitCommunicationContext (
   SmramDescriptor = (EFI_SMRAM_DESCRIPTOR *) GET_GUID_HOB_DATA (GuidHob);\r
   SmmS3ResumeState = (SMM_S3_RESUME_STATE *)(UINTN)SmramDescriptor->CpuStart;\r
 \r
   SmramDescriptor = (EFI_SMRAM_DESCRIPTOR *) GET_GUID_HOB_DATA (GuidHob);\r
   SmmS3ResumeState = (SMM_S3_RESUME_STATE *)(UINTN)SmramDescriptor->CpuStart;\r
 \r

-  DEBUG ((EFI_D_INFO, "InitCommunicationContext - SmmS3ResumeState: %x\n", SmmS3ResumeState));\r
-  DEBUG ((EFI_D_INFO, "InitCommunicationContext - Smst: %x\n", SmmS3ResumeState->Smst));\r
+  DEBUG ((DEBUG_INFO, "InitCommunicationContext - SmmS3ResumeState: %x\n", SmmS3ResumeState));\r
+  DEBUG ((DEBUG_INFO, "InitCommunicationContext - Smst: %x\n", SmmS3ResumeState->Smst));\r

 \r
   SmmCommunicationContext = (EFI_SMM_COMMUNICATION_CONTEXT *)InternalSmstGetVendorTableByGuid (\r
                                                                SmmS3ResumeState->Signature,\r
 \r
   SmmCommunicationContext = (EFI_SMM_COMMUNICATION_CONTEXT *)InternalSmstGetVendorTableByGuid (\r
                                                                SmmS3ResumeState->Signature,\r


@@ -283,7 +283,7 @@ Communicate (
   UINTN                            Size;\r
   EFI_SMM_COMMUNICATION_CONTEXT    *SmmCommunicationContext;\r
 \r
   UINTN                            Size;\r
   EFI_SMM_COMMUNICATION_CONTEXT    *SmmCommunicationContext;\r
 \r

-  DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei Communicate Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei Communicate Enter\n"));\r

 \r
   if (CommBuffer == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
 \r
   if (CommBuffer == NULL) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -316,18 +316,18 @@ Communicate (
   // Check SMRAM locked, it should be done after SMRAM lock.\r
   //\r
   if (!SmmAccess->LockState) {\r
   // Check SMRAM locked, it should be done after SMRAM lock.\r
   //\r
   if (!SmmAccess->LockState) {\r

-    DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei LockState - %x\n", (UINTN)SmmAccess->LockState));\r
+    DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei LockState - %x\n", (UINTN)SmmAccess->LockState));\r

     return EFI_NOT_STARTED;\r
   }\r
 \r
   SmmCommunicationContext = GetCommunicationContext ();\r
     return EFI_NOT_STARTED;\r
   }\r
 \r
   SmmCommunicationContext = GetCommunicationContext ();\r

-  DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei BufferPtrAddress - 0x%016lx, BufferPtr: 0x%016lx\n", SmmCommunicationContext->BufferPtrAddress, *(EFI_PHYSICAL_ADDRESS *)(UINTN)SmmCommunicationContext->BufferPtrAddress));\r
+  DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei BufferPtrAddress - 0x%016lx, BufferPtr: 0x%016lx\n", SmmCommunicationContext->BufferPtrAddress, *(EFI_PHYSICAL_ADDRESS *)(UINTN)SmmCommunicationContext->BufferPtrAddress));\r

 \r
   //\r
   // No need to check if BufferPtr is 0, because it is in PEI phase.\r
   //\r
   *(EFI_PHYSICAL_ADDRESS *)(UINTN)SmmCommunicationContext->BufferPtrAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)CommBuffer;\r
 \r
   //\r
   // No need to check if BufferPtr is 0, because it is in PEI phase.\r
   //\r
   *(EFI_PHYSICAL_ADDRESS *)(UINTN)SmmCommunicationContext->BufferPtrAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)CommBuffer;\r

-  DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei CommBuffer - %x\n", (UINTN)CommBuffer));\r
+  DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei CommBuffer - %x\n", (UINTN)CommBuffer));\r

 \r
   //\r
   // Send command\r
 \r
   //\r
   // Send command\r


@@ -349,7 +349,7 @@ Communicate (
   //\r
   *(EFI_PHYSICAL_ADDRESS *)(UINTN)SmmCommunicationContext->BufferPtrAddress = 0;\r
 \r
   //\r
   *(EFI_PHYSICAL_ADDRESS *)(UINTN)SmmCommunicationContext->BufferPtrAddress = 0;\r
 \r

-  DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei Communicate Exit\n"));\r
+  DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei Communicate Exit\n"));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -394,7 +394,7 @@ PiSmmCommunicationPeiEntryPoint (
   // Check SMRAM locked, it should be done before SMRAM lock.\r
   //\r
   if (SmmAccess->LockState) {\r
   // Check SMRAM locked, it should be done before SMRAM lock.\r
   //\r
   if (SmmAccess->LockState) {\r

-    DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei LockState - %x\n", (UINTN)SmmAccess->LockState));\r
+    DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei LockState - %x\n", (UINTN)SmmAccess->LockState));\r

     return EFI_ACCESS_DENIED;\r
   }\r
 \r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r

diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
index 30f7d57bdd91a2bfa7c8ec02feb95f82802c2cad..4fdea359d822e06fb729add16f1a0c9edf841bcc 100644 (file)
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
+++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
@@ -71,24 +71,24 @@ PiSmmCommunicationHandler (
   EFI_SMM_COMMUNICATE_HEADER       *CommunicateHeader;\r
   EFI_PHYSICAL_ADDRESS             *BufferPtrAddress;\r
 \r
   EFI_SMM_COMMUNICATE_HEADER       *CommunicateHeader;\r
   EFI_PHYSICAL_ADDRESS             *BufferPtrAddress;\r
 \r

-  DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler Enter\n"));\r
+  DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler Enter\n"));\r

 \r
   BufferPtrAddress = (EFI_PHYSICAL_ADDRESS *)(UINTN)mSmmCommunicationContext.BufferPtrAddress;\r
   CommunicateHeader = (EFI_SMM_COMMUNICATE_HEADER *)(UINTN)*BufferPtrAddress;\r
 \r
   BufferPtrAddress = (EFI_PHYSICAL_ADDRESS *)(UINTN)mSmmCommunicationContext.BufferPtrAddress;\r
   CommunicateHeader = (EFI_SMM_COMMUNICATE_HEADER *)(UINTN)*BufferPtrAddress;\r

-  DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler CommunicateHeader - %x\n", CommunicateHeader));\r
+  DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler CommunicateHeader - %x\n", CommunicateHeader));\r

   if (CommunicateHeader == NULL) {\r
   if (CommunicateHeader == NULL) {\r

-    DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler is NULL, needn't to call dispatch function\n"));\r
+    DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler is NULL, needn't to call dispatch function\n"));\r

     Status = EFI_SUCCESS;\r
   } else {\r
     if (!SmmIsBufferOutsideSmmValid ((UINTN)CommunicateHeader, OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data))) {\r
     Status = EFI_SUCCESS;\r
   } else {\r
     if (!SmmIsBufferOutsideSmmValid ((UINTN)CommunicateHeader, OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data))) {\r

-      DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler CommunicateHeader invalid - 0x%x\n", CommunicateHeader));\r
+      DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler CommunicateHeader invalid - 0x%x\n", CommunicateHeader));\r

       Status = EFI_SUCCESS;\r
       goto Done;\r
     }\r
 \r
     CommSize = (UINTN)CommunicateHeader->MessageLength;\r
     if (!SmmIsBufferOutsideSmmValid ((UINTN)&CommunicateHeader->Data[0], CommSize)) {\r
       Status = EFI_SUCCESS;\r
       goto Done;\r
     }\r
 \r
     CommSize = (UINTN)CommunicateHeader->MessageLength;\r
     if (!SmmIsBufferOutsideSmmValid ((UINTN)&CommunicateHeader->Data[0], CommSize)) {\r

-      DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler CommunicateData invalid - 0x%x\n", &CommunicateHeader->Data[0]));\r
+      DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler CommunicateData invalid - 0x%x\n", &CommunicateHeader->Data[0]));\r

       Status = EFI_SUCCESS;\r
       goto Done;\r
     }\r
       Status = EFI_SUCCESS;\r
       goto Done;\r
     }\r


@@ -96,7 +96,7 @@ PiSmmCommunicationHandler (
     //\r
     // Call dispatch function\r
     //\r
     //\r
     // Call dispatch function\r
     //\r

-    DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler Data - %x\n", &CommunicateHeader->Data[0]));\r
+    DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler Data - %x\n", &CommunicateHeader->Data[0]));\r

     Status = gSmst->SmiManage (\r
                       &CommunicateHeader->HeaderGuid,\r
                       NULL,\r
     Status = gSmst->SmiManage (\r
                       &CommunicateHeader->HeaderGuid,\r
                       NULL,\r


@@ -106,8 +106,8 @@ PiSmmCommunicationHandler (
   }\r
 \r
 Done:\r
   }\r
 \r
 Done:\r

-  DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler %r\n", Status));\r
-  DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler Exit\n"));\r
+  DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler %r\n", Status));\r
+  DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler Exit\n"));\r

 \r
   return (Status == EFI_SUCCESS) ? EFI_SUCCESS : EFI_INTERRUPT_PENDING;\r
 }\r
 \r
   return (Status == EFI_SUCCESS) ? EFI_SUCCESS : EFI_INTERRUPT_PENDING;\r
 }\r


@@ -190,11 +190,11 @@ PiSmmCommunicationSmmEntryPoint (
                              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
                              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmCommunication SwSmi: %x\n", (UINTN)SmmSwDispatchContext.SwSmiInputValue));\r
+  DEBUG ((DEBUG_INFO, "SmmCommunication SwSmi: %x\n", (UINTN)SmmSwDispatchContext.SwSmiInputValue));\r

 \r
   BufferPtrAddress = AllocateAcpiNvsMemoryBelow4G (sizeof(EFI_PHYSICAL_ADDRESS));\r
   ASSERT (BufferPtrAddress != NULL);\r
 \r
   BufferPtrAddress = AllocateAcpiNvsMemoryBelow4G (sizeof(EFI_PHYSICAL_ADDRESS));\r
   ASSERT (BufferPtrAddress != NULL);\r

-  DEBUG ((EFI_D_INFO, "SmmCommunication BufferPtrAddress: 0x%016lx, BufferPtr: 0x%016lx\n", (EFI_PHYSICAL_ADDRESS)(UINTN)BufferPtrAddress, *BufferPtrAddress));\r
+  DEBUG ((DEBUG_INFO, "SmmCommunication BufferPtrAddress: 0x%016lx, BufferPtr: 0x%016lx\n", (EFI_PHYSICAL_ADDRESS)(UINTN)BufferPtrAddress, *BufferPtrAddress));\r

 \r
   //\r
   // Save context\r
 \r
   //\r
   // Save context\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
index 2496abb3923ff9e2655cc30c80b7591682b86f0e..0d723336e4d68cf7e657037176fbc0af109a8f20 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
@@ -751,7 +751,7 @@ SmmRestoreCpu (
   IA32_IDT_GATE_DESCRIPTOR      IdtEntryTable[EXCEPTION_VECTOR_NUMBER];\r
   EFI_STATUS                    Status;\r
 \r
   IA32_IDT_GATE_DESCRIPTOR      IdtEntryTable[EXCEPTION_VECTOR_NUMBER];\r
   EFI_STATUS                    Status;\r
 \r

-  DEBUG ((EFI_D_INFO, "SmmRestoreCpu()\n"));\r
+  DEBUG ((DEBUG_INFO, "SmmRestoreCpu()\n"));\r

 \r
   mSmmS3Flag = TRUE;\r
 \r
 \r
   mSmmS3Flag = TRUE;\r
 \r


@@ -759,7 +759,7 @@ SmmRestoreCpu (
   // See if there is enough context to resume PEI Phase\r
   //\r
   if (mSmmS3ResumeState == NULL) {\r
   // See if there is enough context to resume PEI Phase\r
   //\r
   if (mSmmS3ResumeState == NULL) {\r

-    DEBUG ((EFI_D_ERROR, "No context to return to PEI Phase\n"));\r
+    DEBUG ((DEBUG_ERROR, "No context to return to PEI Phase\n"));\r

     CpuDeadLoop ();\r
   }\r
 \r
     CpuDeadLoop ();\r
   }\r
 \r


@@ -822,17 +822,17 @@ SmmRestoreCpu (
   //\r
   mRestoreSmmConfigurationInS3 = TRUE;\r
 \r
   //\r
   mRestoreSmmConfigurationInS3 = TRUE;\r
 \r

-  DEBUG (( EFI_D_INFO, "SMM S3 Return CS                = %x\n", SmmS3ResumeState->ReturnCs));\r
-  DEBUG (( EFI_D_INFO, "SMM S3 Return Entry Point       = %x\n", SmmS3ResumeState->ReturnEntryPoint));\r
-  DEBUG (( EFI_D_INFO, "SMM S3 Return Context1          = %x\n", SmmS3ResumeState->ReturnContext1));\r
-  DEBUG (( EFI_D_INFO, "SMM S3 Return Context2          = %x\n", SmmS3ResumeState->ReturnContext2));\r
-  DEBUG (( EFI_D_INFO, "SMM S3 Return Stack Pointer     = %x\n", SmmS3ResumeState->ReturnStackPointer));\r
+  DEBUG (( DEBUG_INFO, "SMM S3 Return CS                = %x\n", SmmS3ResumeState->ReturnCs));\r
+  DEBUG (( DEBUG_INFO, "SMM S3 Return Entry Point       = %x\n", SmmS3ResumeState->ReturnEntryPoint));\r
+  DEBUG (( DEBUG_INFO, "SMM S3 Return Context1          = %x\n", SmmS3ResumeState->ReturnContext1));\r
+  DEBUG (( DEBUG_INFO, "SMM S3 Return Context2          = %x\n", SmmS3ResumeState->ReturnContext2));\r
+  DEBUG (( DEBUG_INFO, "SMM S3 Return Stack Pointer     = %x\n", SmmS3ResumeState->ReturnStackPointer));\r

 \r
   //\r
   // If SMM is in 32-bit mode, then use SwitchStack() to resume PEI Phase\r
   //\r
   if (SmmS3ResumeState->Signature == SMM_S3_RESUME_SMM_32) {\r
 \r
   //\r
   // If SMM is in 32-bit mode, then use SwitchStack() to resume PEI Phase\r
   //\r
   if (SmmS3ResumeState->Signature == SMM_S3_RESUME_SMM_32) {\r

-    DEBUG ((EFI_D_INFO, "Call SwitchStack() to return to S3 Resume in PEI Phase\n"));\r
+    DEBUG ((DEBUG_INFO, "Call SwitchStack() to return to S3 Resume in PEI Phase\n"));\r

 \r
     SwitchStack (\r
       (SWITCH_STACK_ENTRY_POINT)(UINTN)SmmS3ResumeState->ReturnEntryPoint,\r
 \r
     SwitchStack (\r
       (SWITCH_STACK_ENTRY_POINT)(UINTN)SmmS3ResumeState->ReturnEntryPoint,\r


@@ -846,7 +846,7 @@ SmmRestoreCpu (
   // If SMM is in 64-bit mode, then use AsmDisablePaging64() to resume PEI Phase\r
   //\r
   if (SmmS3ResumeState->Signature == SMM_S3_RESUME_SMM_64) {\r
   // If SMM is in 64-bit mode, then use AsmDisablePaging64() to resume PEI Phase\r
   //\r
   if (SmmS3ResumeState->Signature == SMM_S3_RESUME_SMM_64) {\r

-    DEBUG ((EFI_D_INFO, "Call AsmDisablePaging64() to return to S3 Resume in PEI Phase\n"));\r
+    DEBUG ((DEBUG_INFO, "Call AsmDisablePaging64() to return to S3 Resume in PEI Phase\n"));\r

     //\r
     // Disable interrupt of Debug timer, since new IDT table is for IA32 and will not work in long mode.\r
     //\r
     //\r
     // Disable interrupt of Debug timer, since new IDT table is for IA32 and will not work in long mode.\r
     //\r


@@ -867,7 +867,7 @@ SmmRestoreCpu (
   //\r
   // Can not resume PEI Phase\r
   //\r
   //\r
   // Can not resume PEI Phase\r
   //\r

-  DEBUG ((EFI_D_ERROR, "No context to return to PEI Phase\n"));\r
+  DEBUG ((DEBUG_ERROR, "No context to return to PEI Phase\n"));\r

   CpuDeadLoop ();\r
 }\r
 \r
   CpuDeadLoop ();\r
 }\r
 \r


@@ -904,8 +904,8 @@ InitSmmS3ResumeState (
   } else {\r
     SmramDescriptor = (EFI_SMRAM_DESCRIPTOR *) GET_GUID_HOB_DATA (GuidHob);\r
 \r
   } else {\r
     SmramDescriptor = (EFI_SMRAM_DESCRIPTOR *) GET_GUID_HOB_DATA (GuidHob);\r
 \r

-    DEBUG ((EFI_D_INFO, "SMM S3 SMRAM Structure = %x\n", SmramDescriptor));\r
-    DEBUG ((EFI_D_INFO, "SMM S3 Structure = %x\n", SmramDescriptor->CpuStart));\r
+    DEBUG ((DEBUG_INFO, "SMM S3 SMRAM Structure = %x\n", SmramDescriptor));\r
+    DEBUG ((DEBUG_INFO, "SMM S3 Structure = %x\n", SmramDescriptor->CpuStart));\r

 \r
     SmmS3ResumeState = (SMM_S3_RESUME_STATE *)(UINTN)SmramDescriptor->CpuStart;\r
     ZeroMem (SmmS3ResumeState, sizeof (SMM_S3_RESUME_STATE));\r
 \r
     SmmS3ResumeState = (SMM_S3_RESUME_STATE *)(UINTN)SmramDescriptor->CpuStart;\r
     ZeroMem (SmmS3ResumeState, sizeof (SMM_S3_RESUME_STATE));\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
index 89143810b642294110d7ba00873509a2d1ef04ae..48f9c330b8cf450b43cd14f9fb5e905b8eef3cf8 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
@@ -1788,8 +1788,8 @@ InitializeSmmCpuSemaphores (
   GlobalSemaphoresSize = (sizeof (SMM_CPU_SEMAPHORE_GLOBAL) / sizeof (VOID *)) * SemaphoreSize;\r
   CpuSemaphoresSize    = (sizeof (SMM_CPU_SEMAPHORE_CPU) / sizeof (VOID *)) * ProcessorCount * SemaphoreSize;\r
   TotalSize = GlobalSemaphoresSize + CpuSemaphoresSize;\r
   GlobalSemaphoresSize = (sizeof (SMM_CPU_SEMAPHORE_GLOBAL) / sizeof (VOID *)) * SemaphoreSize;\r
   CpuSemaphoresSize    = (sizeof (SMM_CPU_SEMAPHORE_CPU) / sizeof (VOID *)) * ProcessorCount * SemaphoreSize;\r
   TotalSize = GlobalSemaphoresSize + CpuSemaphoresSize;\r

-  DEBUG((EFI_D_INFO, "One Semaphore Size    = 0x%x\n", SemaphoreSize));\r
-  DEBUG((EFI_D_INFO, "Total Semaphores Size = 0x%x\n", TotalSize));\r
+  DEBUG((DEBUG_INFO, "One Semaphore Size    = 0x%x\n", SemaphoreSize));\r
+  DEBUG((DEBUG_INFO, "Total Semaphores Size = 0x%x\n", TotalSize));\r

   Pages = EFI_SIZE_TO_PAGES (TotalSize);\r
   SemaphoreBlock = AllocatePages (Pages);\r
   ASSERT (SemaphoreBlock != NULL);\r
   Pages = EFI_SIZE_TO_PAGES (TotalSize);\r
   SemaphoreBlock = AllocatePages (Pages);\r
   ASSERT (SemaphoreBlock != NULL);\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
index 2b2e1a53908a39beb0dfae37ff07eedecf934692..c8eacbbecfbb9ec7449f03ac899a38d6ddd02f66 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
@@ -608,14 +608,14 @@ PiCpuSmmEntry (
   // Save the PcdCpuSmmCodeAccessCheckEnable value into a global variable.\r
   //\r
   mSmmCodeAccessCheckEnable = PcdGetBool (PcdCpuSmmCodeAccessCheckEnable);\r
   // Save the PcdCpuSmmCodeAccessCheckEnable value into a global variable.\r
   //\r
   mSmmCodeAccessCheckEnable = PcdGetBool (PcdCpuSmmCodeAccessCheckEnable);\r

-  DEBUG ((EFI_D_INFO, "PcdCpuSmmCodeAccessCheckEnable = %d\n", mSmmCodeAccessCheckEnable));\r
+  DEBUG ((DEBUG_INFO, "PcdCpuSmmCodeAccessCheckEnable = %d\n", mSmmCodeAccessCheckEnable));\r

 \r
   //\r
   // Save the PcdPteMemoryEncryptionAddressOrMask value into a global variable.\r
   // Make sure AddressEncMask is contained to smallest supported address field.\r
   //\r
   mAddressEncMask = PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGING_1G_ADDRESS_MASK_64;\r
 \r
   //\r
   // Save the PcdPteMemoryEncryptionAddressOrMask value into a global variable.\r
   // Make sure AddressEncMask is contained to smallest supported address field.\r
   //\r
   mAddressEncMask = PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGING_1G_ADDRESS_MASK_64;\r

-  DEBUG ((EFI_D_INFO, "mAddressEncMask = 0x%lx\n", mAddressEncMask));\r
+  DEBUG ((DEBUG_INFO, "mAddressEncMask = 0x%lx\n", mAddressEncMask));\r

 \r
   //\r
   // If support CPU hot plug, we need to allocate resources for possibly hot-added processors\r
 \r
   //\r
   // If support CPU hot plug, we need to allocate resources for possibly hot-added processors\r


@@ -767,7 +767,7 @@ PiCpuSmmEntry (
   TileDataSize = ALIGN_VALUE(TileDataSize, SIZE_4KB);\r
   TileSize = TileDataSize + TileCodeSize - 1;\r
   TileSize = 2 * GetPowerOfTwo32 ((UINT32)TileSize);\r
   TileDataSize = ALIGN_VALUE(TileDataSize, SIZE_4KB);\r
   TileSize = TileDataSize + TileCodeSize - 1;\r
   TileSize = 2 * GetPowerOfTwo32 ((UINT32)TileSize);\r

-  DEBUG ((EFI_D_INFO, "SMRAM TileSize = 0x%08x (0x%08x, 0x%08x)\n", TileSize, TileCodeSize, TileDataSize));\r
+  DEBUG ((DEBUG_INFO, "SMRAM TileSize = 0x%08x (0x%08x, 0x%08x)\n", TileSize, TileCodeSize, TileDataSize));\r

 \r
   //\r
   // If the TileSize is larger than space available for the SMI Handler of\r
 \r
   //\r
   // If the TileSize is larger than space available for the SMI Handler of\r


@@ -797,7 +797,7 @@ PiCpuSmmEntry (
     Buffer = AllocateAlignedCodePages (BufferPages, SIZE_4KB);\r
   }\r
   ASSERT (Buffer != NULL);\r
     Buffer = AllocateAlignedCodePages (BufferPages, SIZE_4KB);\r
   }\r
   ASSERT (Buffer != NULL);\r

-  DEBUG ((EFI_D_INFO, "SMRAM SaveState Buffer (0x%08x, 0x%08x)\n", Buffer, EFI_PAGES_TO_SIZE(BufferPages)));\r
+  DEBUG ((DEBUG_INFO, "SMRAM SaveState Buffer (0x%08x, 0x%08x)\n", Buffer, EFI_PAGES_TO_SIZE(BufferPages)));\r

 \r
   //\r
   // Allocate buffer for pointers to array in  SMM_CPU_PRIVATE_DATA.\r
 \r
   //\r
   // Allocate buffer for pointers to array in  SMM_CPU_PRIVATE_DATA.\r


@@ -842,7 +842,7 @@ PiCpuSmmEntry (
       ASSERT_EFI_ERROR (Status);\r
       mCpuHotPlugData.ApicId[Index] = gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId;\r
 \r
       ASSERT_EFI_ERROR (Status);\r
       mCpuHotPlugData.ApicId[Index] = gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId;\r
 \r

-      DEBUG ((EFI_D_INFO, "CPU[%03x]  APIC ID=%04x  SMBASE=%08x  SaveState=%08x  Size=%08x\n",\r
+      DEBUG ((DEBUG_INFO, "CPU[%03x]  APIC ID=%04x  SMBASE=%08x  SaveState=%08x  Size=%08x\n",\r

         Index,\r
         (UINT32)gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId,\r
         mCpuHotPlugData.SmBase[Index],\r
         Index,\r
         (UINT32)gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId,\r
         mCpuHotPlugData.SmBase[Index],\r


@@ -1072,7 +1072,7 @@ PiCpuSmmEntry (
   GetAcpiS3EnableFlag ();\r
   InitSmmS3ResumeState (Cr3);\r
 \r
   GetAcpiS3EnableFlag ();\r
   InitSmmS3ResumeState (Cr3);\r
 \r

-  DEBUG ((EFI_D_INFO, "SMM CPU Module exit from SMRAM with EFI_SUCCESS\n"));\r
+  DEBUG ((DEBUG_INFO, "SMM CPU Module exit from SMRAM with EFI_SUCCESS\n"));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -1162,7 +1162,7 @@ FindSmramInfo (
     }\r
   } while (Found);\r
 \r
     }\r
   } while (Found);\r
 \r

-  DEBUG ((EFI_D_INFO, "SMRR Base: 0x%x, SMRR Size: 0x%x\n", *SmrrBase, *SmrrSize));\r
+  DEBUG ((DEBUG_INFO, "SMRR Base: 0x%x, SMRR Size: 0x%x\n", *SmrrBase, *SmrrSize));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
index 972bdc28595efd6c7cc31bcb580a6d6f0fdd4a6c..c3f9794b9538dde2da524c2786cf87bea58b369c 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
@@ -514,14 +514,14 @@ InitProtectedMemRange (
 \r
   mSplitMemRangeCount = NumberOfSpliteRange;\r
 \r
 \r
   mSplitMemRangeCount = NumberOfSpliteRange;\r
 \r

-  DEBUG ((EFI_D_INFO, "SMM Profile Memory Ranges:\n"));\r
+  DEBUG ((DEBUG_INFO, "SMM Profile Memory Ranges:\n"));\r

   for (Index = 0; Index < mProtectionMemRangeCount; Index++) {\r
   for (Index = 0; Index < mProtectionMemRangeCount; Index++) {\r

-    DEBUG ((EFI_D_INFO, "mProtectionMemRange[%d].Base = %lx\n", Index, mProtectionMemRange[Index].Range.Base));\r
-    DEBUG ((EFI_D_INFO, "mProtectionMemRange[%d].Top  = %lx\n", Index, mProtectionMemRange[Index].Range.Top));\r
+    DEBUG ((DEBUG_INFO, "mProtectionMemRange[%d].Base = %lx\n", Index, mProtectionMemRange[Index].Range.Base));\r
+    DEBUG ((DEBUG_INFO, "mProtectionMemRange[%d].Top  = %lx\n", Index, mProtectionMemRange[Index].Range.Top));\r

   }\r
   for (Index = 0; Index < mSplitMemRangeCount; Index++) {\r
   }\r
   for (Index = 0; Index < mSplitMemRangeCount; Index++) {\r

-    DEBUG ((EFI_D_INFO, "mSplitMemRange[%d].Base = %lx\n", Index, mSplitMemRange[Index].Base));\r
-    DEBUG ((EFI_D_INFO, "mSplitMemRange[%d].Top  = %lx\n", Index, mSplitMemRange[Index].Top));\r
+    DEBUG ((DEBUG_INFO, "mSplitMemRange[%d].Base = %lx\n", Index, mSplitMemRange[Index].Base));\r
+    DEBUG ((DEBUG_INFO, "mSplitMemRange[%d].Top  = %lx\n", Index, mSplitMemRange[Index].Top));\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r


@@ -671,7 +671,7 @@ InitPaging (
   //\r
   // Go through page table and set several page table entries to absent or execute-disable.\r
   //\r
   //\r
   // Go through page table and set several page table entries to absent or execute-disable.\r
   //\r

-  DEBUG ((EFI_D_INFO, "Patch page table start ...\n"));\r
+  DEBUG ((DEBUG_INFO, "Patch page table start ...\n"));\r

   for (Pml5Index = 0; Pml5Index < NumberOfPml5Entries; Pml5Index++) {\r
     if ((Pml5[Pml5Index] & IA32_PG_P) == 0) {\r
       //\r
   for (Pml5Index = 0; Pml5Index < NumberOfPml5Entries; Pml5Index++) {\r
     if ((Pml5[Pml5Index] & IA32_PG_P) == 0) {\r
       //\r


@@ -760,7 +760,7 @@ InitPaging (
   // Flush TLB\r
   //\r
   CpuFlushTlb ();\r
   // Flush TLB\r
   //\r
   CpuFlushTlb ();\r

-  DEBUG ((EFI_D_INFO, "Patch page table done!\n"));\r
+  DEBUG ((DEBUG_INFO, "Patch page table done!\n"));\r

   //\r
   // Set execute-disable flag\r
   //\r
   //\r
   // Set execute-disable flag\r
   //\r


@@ -786,7 +786,7 @@ GetSmiCommandPort (
   ASSERT (Fadt != NULL);\r
 \r
   mSmiCommandPort = Fadt->SmiCmd;\r
   ASSERT (Fadt != NULL);\r
 \r
   mSmiCommandPort = Fadt->SmiCmd;\r

-  DEBUG ((EFI_D_INFO, "mSmiCommandPort = %x\n", mSmiCommandPort));\r
+  DEBUG ((DEBUG_INFO, "mSmiCommandPort = %x\n", mSmiCommandPort));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
index 83ce1c4037d1b72dc1d6bb2ea65adf709724f658..6fa907161a9079def8834cf1c0873fd20c281e35 100644 (file)
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
@@ -513,7 +513,7 @@ S3ResumeBootOs (
           EFI_ERROR_CODE | EFI_ERROR_MAJOR,\r
           (EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_EC_S3_OS_WAKE_ERROR)\r
           );\r
           EFI_ERROR_CODE | EFI_ERROR_MAJOR,\r
           (EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_EC_S3_OS_WAKE_ERROR)\r
           );\r

-        DEBUG (( EFI_D_ERROR, "Unsupported for 32bit DXE transfer to 64bit OS waking vector!\r\n"));\r
+        DEBUG (( DEBUG_ERROR, "Unsupported for 32bit DXE transfer to 64bit OS waking vector!\r\n"));\r

         ASSERT (FALSE);\r
         CpuDeadLoop ();\r
         return ;\r
         ASSERT (FALSE);\r
         CpuDeadLoop ();\r
         return ;\r


@@ -1136,4 +1136,3 @@ PeimS3ResumeEntryPoint (
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r

-\r