From 96e1cba5c1cb0f9272bbde6e851cae60521a0ef1 Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Tue, 16 Nov 2021 19:21:42 -0800 Subject: 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 Cc: Leif Lindholm Cc: Michael Kubacki Signed-off-by: Michael D Kinney Reviewed-by: Ray Ni --- .../PiSmmCommunication/PiSmmCommunicationPei.c | 24 +++++++++++----------- .../PiSmmCommunication/PiSmmCommunicationSmm.c | 20 +++++++++--------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'UefiCpuPkg/PiSmmCommunication') diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c index 110165b20b..e9e2464be7 100644 --- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c +++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c @@ -197,8 +197,8 @@ InternalSmstGetVendorTableByGuid ( // 32 PEI + 64 DXE // Smst64 = (EFI_SMM_SYSTEM_TABLE2_64 *)Smst; - DEBUG ((EFI_D_INFO, "InitCommunicationContext - SmmConfigurationTable: %x\n", Smst64->SmmConfigurationTable)); - DEBUG ((EFI_D_INFO, "InitCommunicationContext - NumberOfTableEntries: %x\n", Smst64->NumberOfTableEntries)); + DEBUG ((DEBUG_INFO, "InitCommunicationContext - SmmConfigurationTable: %x\n", Smst64->SmmConfigurationTable)); + DEBUG ((DEBUG_INFO, "InitCommunicationContext - NumberOfTableEntries: %x\n", Smst64->NumberOfTableEntries)); SmmConfigurationTable64 = (EFI_CONFIGURATION_TABLE64 *)(UINTN)Smst64->SmmConfigurationTable; NumberOfTableEntries = (UINTN)Smst64->NumberOfTableEntries; for (Index = 0; Index < NumberOfTableEntries; Index++) { @@ -208,8 +208,8 @@ InternalSmstGetVendorTableByGuid ( } return NULL; } else { - DEBUG ((EFI_D_INFO, "InitCommunicationContext - SmmConfigurationTable: %x\n", Smst->SmmConfigurationTable)); - DEBUG ((EFI_D_INFO, "InitCommunicationContext - NumberOfTableEntries: %x\n", Smst->NumberOfTableEntries)); + DEBUG ((DEBUG_INFO, "InitCommunicationContext - SmmConfigurationTable: %x\n", Smst->SmmConfigurationTable)); + DEBUG ((DEBUG_INFO, "InitCommunicationContext - NumberOfTableEntries: %x\n", Smst->NumberOfTableEntries)); SmmConfigurationTable = Smst->SmmConfigurationTable; NumberOfTableEntries = Smst->NumberOfTableEntries; for (Index = 0; Index < NumberOfTableEntries; Index++) { @@ -239,8 +239,8 @@ InitCommunicationContext ( SmramDescriptor = (EFI_SMRAM_DESCRIPTOR *) GET_GUID_HOB_DATA (GuidHob); SmmS3ResumeState = (SMM_S3_RESUME_STATE *)(UINTN)SmramDescriptor->CpuStart; - DEBUG ((EFI_D_INFO, "InitCommunicationContext - SmmS3ResumeState: %x\n", SmmS3ResumeState)); - DEBUG ((EFI_D_INFO, "InitCommunicationContext - Smst: %x\n", SmmS3ResumeState->Smst)); + DEBUG ((DEBUG_INFO, "InitCommunicationContext - SmmS3ResumeState: %x\n", SmmS3ResumeState)); + DEBUG ((DEBUG_INFO, "InitCommunicationContext - Smst: %x\n", SmmS3ResumeState->Smst)); SmmCommunicationContext = (EFI_SMM_COMMUNICATION_CONTEXT *)InternalSmstGetVendorTableByGuid ( SmmS3ResumeState->Signature, @@ -283,7 +283,7 @@ Communicate ( UINTN Size; EFI_SMM_COMMUNICATION_CONTEXT *SmmCommunicationContext; - DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei Communicate Enter\n")); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei Communicate Enter\n")); if (CommBuffer == NULL) { return EFI_INVALID_PARAMETER; @@ -316,18 +316,18 @@ Communicate ( // Check SMRAM locked, it should be done after SMRAM lock. // if (!SmmAccess->LockState) { - DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei LockState - %x\n", (UINTN)SmmAccess->LockState)); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei LockState - %x\n", (UINTN)SmmAccess->LockState)); return EFI_NOT_STARTED; } SmmCommunicationContext = GetCommunicationContext (); - DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei BufferPtrAddress - 0x%016lx, BufferPtr: 0x%016lx\n", SmmCommunicationContext->BufferPtrAddress, *(EFI_PHYSICAL_ADDRESS *)(UINTN)SmmCommunicationContext->BufferPtrAddress)); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei BufferPtrAddress - 0x%016lx, BufferPtr: 0x%016lx\n", SmmCommunicationContext->BufferPtrAddress, *(EFI_PHYSICAL_ADDRESS *)(UINTN)SmmCommunicationContext->BufferPtrAddress)); // // No need to check if BufferPtr is 0, because it is in PEI phase. // *(EFI_PHYSICAL_ADDRESS *)(UINTN)SmmCommunicationContext->BufferPtrAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)CommBuffer; - DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei CommBuffer - %x\n", (UINTN)CommBuffer)); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei CommBuffer - %x\n", (UINTN)CommBuffer)); // // Send command @@ -349,7 +349,7 @@ Communicate ( // *(EFI_PHYSICAL_ADDRESS *)(UINTN)SmmCommunicationContext->BufferPtrAddress = 0; - DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei Communicate Exit\n")); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei Communicate Exit\n")); return EFI_SUCCESS; } @@ -394,7 +394,7 @@ PiSmmCommunicationPeiEntryPoint ( // Check SMRAM locked, it should be done before SMRAM lock. // if (SmmAccess->LockState) { - DEBUG ((EFI_D_INFO, "PiSmmCommunicationPei LockState - %x\n", (UINTN)SmmAccess->LockState)); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationPei LockState - %x\n", (UINTN)SmmAccess->LockState)); return EFI_ACCESS_DENIED; } diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c index 30f7d57bdd..4fdea359d8 100644 --- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c +++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c @@ -71,24 +71,24 @@ PiSmmCommunicationHandler ( EFI_SMM_COMMUNICATE_HEADER *CommunicateHeader; EFI_PHYSICAL_ADDRESS *BufferPtrAddress; - DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler Enter\n")); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler Enter\n")); BufferPtrAddress = (EFI_PHYSICAL_ADDRESS *)(UINTN)mSmmCommunicationContext.BufferPtrAddress; CommunicateHeader = (EFI_SMM_COMMUNICATE_HEADER *)(UINTN)*BufferPtrAddress; - DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler CommunicateHeader - %x\n", CommunicateHeader)); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler CommunicateHeader - %x\n", CommunicateHeader)); if (CommunicateHeader == NULL) { - DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler is NULL, needn't to call dispatch function\n")); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler is NULL, needn't to call dispatch function\n")); Status = EFI_SUCCESS; } else { if (!SmmIsBufferOutsideSmmValid ((UINTN)CommunicateHeader, OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data))) { - DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler CommunicateHeader invalid - 0x%x\n", CommunicateHeader)); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler CommunicateHeader invalid - 0x%x\n", CommunicateHeader)); Status = EFI_SUCCESS; goto Done; } CommSize = (UINTN)CommunicateHeader->MessageLength; if (!SmmIsBufferOutsideSmmValid ((UINTN)&CommunicateHeader->Data[0], CommSize)) { - DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler CommunicateData invalid - 0x%x\n", &CommunicateHeader->Data[0])); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler CommunicateData invalid - 0x%x\n", &CommunicateHeader->Data[0])); Status = EFI_SUCCESS; goto Done; } @@ -96,7 +96,7 @@ PiSmmCommunicationHandler ( // // Call dispatch function // - DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler Data - %x\n", &CommunicateHeader->Data[0])); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler Data - %x\n", &CommunicateHeader->Data[0])); Status = gSmst->SmiManage ( &CommunicateHeader->HeaderGuid, NULL, @@ -106,8 +106,8 @@ PiSmmCommunicationHandler ( } Done: - DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler %r\n", Status)); - DEBUG ((EFI_D_INFO, "PiSmmCommunicationHandler Exit\n")); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler %r\n", Status)); + DEBUG ((DEBUG_INFO, "PiSmmCommunicationHandler Exit\n")); return (Status == EFI_SUCCESS) ? EFI_SUCCESS : EFI_INTERRUPT_PENDING; } @@ -190,11 +190,11 @@ PiSmmCommunicationSmmEntryPoint ( ); ASSERT_EFI_ERROR (Status); - DEBUG ((EFI_D_INFO, "SmmCommunication SwSmi: %x\n", (UINTN)SmmSwDispatchContext.SwSmiInputValue)); + DEBUG ((DEBUG_INFO, "SmmCommunication SwSmi: %x\n", (UINTN)SmmSwDispatchContext.SwSmiInputValue)); BufferPtrAddress = AllocateAcpiNvsMemoryBelow4G (sizeof(EFI_PHYSICAL_ADDRESS)); ASSERT (BufferPtrAddress != NULL); - DEBUG ((EFI_D_INFO, "SmmCommunication BufferPtrAddress: 0x%016lx, BufferPtr: 0x%016lx\n", (EFI_PHYSICAL_ADDRESS)(UINTN)BufferPtrAddress, *BufferPtrAddress)); + DEBUG ((DEBUG_INFO, "SmmCommunication BufferPtrAddress: 0x%016lx, BufferPtr: 0x%016lx\n", (EFI_PHYSICAL_ADDRESS)(UINTN)BufferPtrAddress, *BufferPtrAddress)); // // Save context -- cgit v1.2.3