MdeModulePkg: 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: Liming Gao <gaoliming@byosoft.com.cn>

4 files changed, 46 insertions, 48 deletions

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
index 4847632..dbe5c00 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
@@ -89,7 +89,7 @@ FtwAllocate (
   // Check if there is enough space for the coming allocation

   //

   if (FTW_WRITE_TOTAL_SIZE (NumberOfWrites, PrivateDataSize) > FtwDevice->FtwWorkSpaceHeader->WriteQueueSize) {

-    DEBUG ((EFI_D_ERROR, "Ftw: Allocate() request exceed Workspace, Caller: %g\n", CallerId));

+    DEBUG ((DEBUG_ERROR, "Ftw: Allocate() request exceed Workspace, Caller: %g\n", CallerId));

     return EFI_BUFFER_TOO_SMALL;

   }

   //

@@ -153,7 +153,7 @@ FtwAllocate (
   }

 

   DEBUG (

-    (EFI_D_INFO,

+    (DEBUG_INFO,

     "Ftw: Allocate() success, Caller:%g, # %d\n",

     CallerId,

     NumberOfWrites)

@@ -358,8 +358,8 @@ FtwWrite (
       // Ftw Write Header is not allocated

       // Additional private data is not NULL, the private data size can't be determined.

       //

-      DEBUG ((EFI_D_ERROR, "Ftw: no allocates space for write record!\n"));

-      DEBUG ((EFI_D_ERROR, "Ftw: Allocate service should be called before Write service!\n"));

+      DEBUG ((DEBUG_ERROR, "Ftw: no allocates space for write record!\n"));

+      DEBUG ((DEBUG_ERROR, "Ftw: Allocate service should be called before Write service!\n"));

       return EFI_NOT_READY;

     }

   }

@@ -396,7 +396,7 @@ FtwWrite (
 

   Status = Fvb->GetPhysicalAddress (Fvb, &FvbPhysicalAddress);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Ftw: Write(), Get FVB physical address - %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "Ftw: Write(), Get FVB physical address - %r\n", Status));

     return EFI_ABORTED;

   }

 

@@ -405,12 +405,12 @@ FtwWrite (
   //

   Status = Fvb->GetBlockSize (Fvb, 0, &BlockSize, &NumberOfBlocks);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Ftw: Write(), Get block size - %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "Ftw: Write(), Get block size - %r\n", Status));

     return EFI_ABORTED;

   }

 

   NumberOfWriteBlocks = FTW_BLOCKS (Offset + Length, BlockSize);

-  DEBUG ((EFI_D_INFO, "Ftw: Write(), BlockSize - 0x%x, NumberOfWriteBlock - 0x%x\n", BlockSize, NumberOfWriteBlocks));

+  DEBUG ((DEBUG_INFO, "Ftw: Write(), BlockSize - 0x%x, NumberOfWriteBlock - 0x%x\n", BlockSize, NumberOfWriteBlocks));

   WriteLength = NumberOfWriteBlocks * BlockSize;

 

   //

@@ -611,7 +611,7 @@ FtwWrite (
   FreePool (SpareBuffer);

 

   DEBUG (

-    (EFI_D_INFO,

+    (DEBUG_INFO,

     "Ftw: Write() success, (Lba:Offset)=(%lx:0x%x), Length: 0x%x\n",

     Lba,

     Offset,

@@ -674,7 +674,7 @@ FtwRestart (
   //

   Status = Fvb->GetBlockSize (Fvb, 0, &BlockSize, &NumberOfBlocks);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Ftw: Restart(), Get block size - %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "Ftw: Restart(), Get block size - %r\n", Status));

     return EFI_ABORTED;

   }

 

@@ -714,7 +714,7 @@ FtwRestart (
     return EFI_ABORTED;

   }

 

-  DEBUG ((EFI_D_INFO, "%a(): success\n", __FUNCTION__));

+  DEBUG ((DEBUG_INFO, "%a(): success\n", __FUNCTION__));

   return EFI_SUCCESS;

 }

 

@@ -769,7 +769,7 @@ FtwAbort (
 

   FtwDevice->FtwLastWriteHeader->Complete = FTW_VALID_STATE;

 

-  DEBUG ((EFI_D_INFO, "%a(): success\n", __FUNCTION__));

+  DEBUG ((DEBUG_INFO, "%a(): success\n", __FUNCTION__));

   return EFI_SUCCESS;

 }

 

@@ -880,8 +880,7 @@ FtwGetLastWrite (
     Status = EFI_SUCCESS;

   }

 

-  DEBUG ((EFI_D_INFO, "%a(): success\n", __FUNCTION__));

+  DEBUG ((DEBUG_INFO, "%a(): success\n", __FUNCTION__));

 

   return Status;

 }

-

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
index 9612b39..de7544e 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
@@ -324,13 +324,13 @@ SmmFaultTolerantWriteHandler (
   TempCommBufferSize = *CommBufferSize;

 

   if (TempCommBufferSize < SMM_FTW_COMMUNICATE_HEADER_SIZE) {

-    DEBUG ((EFI_D_ERROR, "SmmFtwHandler: SMM communication buffer size invalid!\n"));

+    DEBUG ((DEBUG_ERROR, "SmmFtwHandler: SMM communication buffer size invalid!\n"));

     return EFI_SUCCESS;

   }

   CommBufferPayloadSize = TempCommBufferSize - SMM_FTW_COMMUNICATE_HEADER_SIZE;

 

   if (!FtwSmmIsBufferOutsideSmmValid ((UINTN)CommBuffer, TempCommBufferSize)) {

-    DEBUG ((EFI_D_ERROR, "SmmFtwHandler: SMM communication buffer in SMRAM or overflow!\n"));

+    DEBUG ((DEBUG_ERROR, "SmmFtwHandler: SMM communication buffer in SMRAM or overflow!\n"));

     return EFI_SUCCESS;

   }

 

@@ -340,7 +340,7 @@ SmmFaultTolerantWriteHandler (
     //

     // It will be not safe to expose the operations after End Of Dxe.

     //

-    DEBUG ((EFI_D_ERROR, "SmmFtwHandler: Not safe to do the operation: %x after End Of Dxe, so access denied!\n", SmmFtwFunctionHeader->Function));

+    DEBUG ((DEBUG_ERROR, "SmmFtwHandler: Not safe to do the operation: %x after End Of Dxe, so access denied!\n", SmmFtwFunctionHeader->Function));

     SmmFtwFunctionHeader->ReturnStatus = EFI_ACCESS_DENIED;

     return EFI_SUCCESS;

   }

@@ -348,7 +348,7 @@ SmmFaultTolerantWriteHandler (
   switch (SmmFtwFunctionHeader->Function) {

     case FTW_FUNCTION_GET_MAX_BLOCK_SIZE:

       if (CommBufferPayloadSize < sizeof (SMM_FTW_GET_MAX_BLOCK_SIZE_HEADER)) {

-        DEBUG ((EFI_D_ERROR, "GetMaxBlockSize: SMM communication buffer size invalid!\n"));

+        DEBUG ((DEBUG_ERROR, "GetMaxBlockSize: SMM communication buffer size invalid!\n"));

         return EFI_SUCCESS;

       }

       SmmGetMaxBlockSizeHeader = (SMM_FTW_GET_MAX_BLOCK_SIZE_HEADER *) SmmFtwFunctionHeader->Data;

@@ -361,7 +361,7 @@ SmmFaultTolerantWriteHandler (
 

     case FTW_FUNCTION_ALLOCATE:

       if (CommBufferPayloadSize < sizeof (SMM_FTW_ALLOCATE_HEADER)) {

-        DEBUG ((EFI_D_ERROR, "Allocate: SMM communication buffer size invalid!\n"));

+        DEBUG ((DEBUG_ERROR, "Allocate: SMM communication buffer size invalid!\n"));

         return EFI_SUCCESS;

       }

       SmmFtwAllocateHeader = (SMM_FTW_ALLOCATE_HEADER *) SmmFtwFunctionHeader->Data;

@@ -375,7 +375,7 @@ SmmFaultTolerantWriteHandler (
 

     case FTW_FUNCTION_WRITE:

       if (CommBufferPayloadSize < OFFSET_OF (SMM_FTW_WRITE_HEADER, Data)) {

-        DEBUG ((EFI_D_ERROR, "Write: SMM communication buffer size invalid!\n"));

+        DEBUG ((DEBUG_ERROR, "Write: SMM communication buffer size invalid!\n"));

         return EFI_SUCCESS;

       }

       SmmFtwWriteHeader = (SMM_FTW_WRITE_HEADER *) SmmFtwFunctionHeader->Data;

@@ -395,7 +395,7 @@ SmmFaultTolerantWriteHandler (
       // SMRAM range check already covered before

       //

       if (InfoSize > CommBufferPayloadSize) {

-        DEBUG ((EFI_D_ERROR, "Write: Data size exceed communication buffer size limit!\n"));

+        DEBUG ((DEBUG_ERROR, "Write: Data size exceed communication buffer size limit!\n"));

         Status = EFI_ACCESS_DENIED;

         break;

       }

@@ -431,7 +431,7 @@ SmmFaultTolerantWriteHandler (
 

     case FTW_FUNCTION_RESTART:

       if (CommBufferPayloadSize < sizeof (SMM_FTW_RESTART_HEADER)) {

-        DEBUG ((EFI_D_ERROR, "Restart: SMM communication buffer size invalid!\n"));

+        DEBUG ((DEBUG_ERROR, "Restart: SMM communication buffer size invalid!\n"));

         return EFI_SUCCESS;

       }

       SmmFtwRestartHeader = (SMM_FTW_RESTART_HEADER *) SmmFtwFunctionHeader->Data;

@@ -451,7 +451,7 @@ SmmFaultTolerantWriteHandler (
 

     case FTW_FUNCTION_GET_LAST_WRITE:

       if (CommBufferPayloadSize < OFFSET_OF (SMM_FTW_GET_LAST_WRITE_HEADER, Data)) {

-        DEBUG ((EFI_D_ERROR, "GetLastWrite: SMM communication buffer size invalid!\n"));

+        DEBUG ((DEBUG_ERROR, "GetLastWrite: SMM communication buffer size invalid!\n"));

         return EFI_SUCCESS;

       }

       SmmFtwGetLastWriteHeader = (SMM_FTW_GET_LAST_WRITE_HEADER *) SmmFtwFunctionHeader->Data;

@@ -469,7 +469,7 @@ SmmFaultTolerantWriteHandler (
       // SMRAM range check already covered before

       //

       if (InfoSize > CommBufferPayloadSize) {

-        DEBUG ((EFI_D_ERROR, "Data size exceed communication buffer size limit!\n"));

+        DEBUG ((DEBUG_ERROR, "Data size exceed communication buffer size limit!\n"));

         Status = EFI_ACCESS_DENIED;

         break;

       }

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
index ed73f88..dce50e8 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
@@ -340,7 +340,7 @@ FlushSpareBlockToBootBlock (
   //

   Status = SarProtocol->GetSwapState (SarProtocol, &TopSwap);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Ftw: Get Top Swapped status - %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "Ftw: Get Top Swapped status - %r\n", Status));

     FreePool (Buffer);

     return EFI_ABORTED;

   }

@@ -427,7 +427,7 @@ FlushSpareBlockToBootBlock (
                                         Ptr

                                         );

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "Ftw: FVB Write boot block - %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "Ftw: FVB Write boot block - %r\n", Status));

       FreePool (Buffer);

       return Status;

     }

@@ -526,7 +526,7 @@ FlushSpareBlockToTargetBlock (
     Count   = BlockSize;

     Status  = FvBlock->Write (FvBlock, Lba + Index, 0, &Count, Ptr);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "Ftw: FVB Write block - %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "Ftw: FVB Write block - %r\n", Status));

       FreePool (Buffer);

       return Status;

     }

@@ -667,7 +667,7 @@ FlushSpareBlockToWorkingBlock (
                                       Ptr

                                       );

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "Ftw: FVB Write block - %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "Ftw: FVB Write block - %r\n", Status));

       FreePool (Buffer);

       return Status;

     }

@@ -984,7 +984,7 @@ InitFtwDevice (
   FtwDevice->WorkSpaceLength  = (UINTN) PcdGet32 (PcdFlashNvStorageFtwWorkingSize);

   FtwDevice->SpareAreaLength  = (UINTN) PcdGet32 (PcdFlashNvStorageFtwSpareSize);

   if ((FtwDevice->WorkSpaceLength == 0) || (FtwDevice->SpareAreaLength == 0)) {

-    DEBUG ((EFI_D_ERROR, "Ftw: Workspace or Spare block does not exist!\n"));

+    DEBUG ((DEBUG_ERROR, "Ftw: Workspace or Spare block does not exist!\n"));

     FreePool (FtwDevice);

     return EFI_INVALID_PARAMETER;

   }

@@ -1103,13 +1103,13 @@ FindFvbForFtw (
             //

             if (((FtwDevice->WorkSpaceAddress & (FtwDevice->WorkBlockSize - 1)) != 0) ||

                 ((FtwDevice->WorkSpaceLength & (FtwDevice->WorkBlockSize - 1)) != 0)) {

-              DEBUG ((EFI_D_ERROR, "Ftw: Work space address or length is not block size aligned when work space size is larger than one block size\n"));

+              DEBUG ((DEBUG_ERROR, "Ftw: Work space address or length is not block size aligned when work space size is larger than one block size\n"));

               FreePool (HandleBuffer);

               ASSERT (FALSE);

               return EFI_ABORTED;

             }

           } else if ((FtwDevice->FtwWorkSpaceBase + FtwDevice->FtwWorkSpaceSize) > FtwDevice->WorkBlockSize) {

-            DEBUG ((EFI_D_ERROR, "Ftw: The work space range should not span blocks when work space size is less than one block size\n"));

+            DEBUG ((DEBUG_ERROR, "Ftw: The work space range should not span blocks when work space size is less than one block size\n"));

             FreePool (HandleBuffer);

             ASSERT (FALSE);

             return EFI_ABORTED;

@@ -1138,7 +1138,7 @@ FindFvbForFtw (
           // Check the range of spare area to make sure that it's in FV range

           //

           if ((FtwDevice->FtwSpareLba + FtwDevice->NumberOfSpareBlock) > NumberOfBlocks) {

-            DEBUG ((EFI_D_ERROR, "Ftw: Spare area is out of FV range\n"));

+            DEBUG ((DEBUG_ERROR, "Ftw: Spare area is out of FV range\n"));

             FreePool (HandleBuffer);

             ASSERT (FALSE);

             return EFI_ABORTED;

@@ -1148,7 +1148,7 @@ FindFvbForFtw (
           //

           if (((FtwDevice->SpareAreaAddress & (FtwDevice->SpareBlockSize - 1)) != 0) ||

               ((FtwDevice->SpareAreaLength & (FtwDevice->SpareBlockSize - 1)) != 0)) {

-            DEBUG ((EFI_D_ERROR, "Ftw: Spare area address or length is not block size aligned\n"));

+            DEBUG ((DEBUG_ERROR, "Ftw: Spare area address or length is not block size aligned\n"));

             FreePool (HandleBuffer);

             //

             // Report Status Code EFI_SW_EC_ABORTED.

@@ -1168,8 +1168,8 @@ FindFvbForFtw (
     (FtwDevice->FtwWorkSpaceLba == (EFI_LBA) (-1)) || (FtwDevice->FtwSpareLba == (EFI_LBA) (-1))) {

     return EFI_ABORTED;

   }

-  DEBUG ((EFI_D_INFO, "Ftw: FtwWorkSpaceLba - 0x%lx, WorkBlockSize  - 0x%x, FtwWorkSpaceBase - 0x%x\n", FtwDevice->FtwWorkSpaceLba, FtwDevice->WorkBlockSize, FtwDevice->FtwWorkSpaceBase));

-  DEBUG ((EFI_D_INFO, "Ftw: FtwSpareLba     - 0x%lx, SpareBlockSize - 0x%x\n", FtwDevice->FtwSpareLba, FtwDevice->SpareBlockSize));

+  DEBUG ((DEBUG_INFO, "Ftw: FtwWorkSpaceLba - 0x%lx, WorkBlockSize  - 0x%x, FtwWorkSpaceBase - 0x%x\n", FtwDevice->FtwWorkSpaceLba, FtwDevice->WorkBlockSize, FtwDevice->FtwWorkSpaceBase));

+  DEBUG ((DEBUG_INFO, "Ftw: FtwSpareLba     - 0x%lx, SpareBlockSize - 0x%x\n", FtwDevice->FtwSpareLba, FtwDevice->SpareBlockSize));

 

   return EFI_SUCCESS;

 }

@@ -1225,7 +1225,7 @@ InitFtwProtocol (
     }

   }

   FtwDevice->FtwWorkBlockLba = FtwDevice->FtwWorkSpaceLba + FtwDevice->NumberOfWorkSpaceBlock - FtwDevice->NumberOfWorkBlock;

-  DEBUG ((EFI_D_INFO, "Ftw: NumberOfWorkBlock - 0x%x, FtwWorkBlockLba - 0x%lx\n", FtwDevice->NumberOfWorkBlock, FtwDevice->FtwWorkBlockLba));

+  DEBUG ((DEBUG_INFO, "Ftw: NumberOfWorkBlock - 0x%x, FtwWorkBlockLba - 0x%lx\n", FtwDevice->NumberOfWorkBlock, FtwDevice->FtwWorkBlockLba));

 

   //

   // Calcualte the LBA and base of work space in spare block.

@@ -1234,7 +1234,7 @@ InitFtwProtocol (
   WorkSpaceLbaOffset = FtwDevice->FtwWorkSpaceLba - FtwDevice->FtwWorkBlockLba;

   FtwDevice->FtwWorkSpaceLbaInSpare = (EFI_LBA) (((UINTN) WorkSpaceLbaOffset * FtwDevice->WorkBlockSize + FtwDevice->FtwWorkSpaceBase) / FtwDevice->SpareBlockSize);

   FtwDevice->FtwWorkSpaceBaseInSpare = ((UINTN) WorkSpaceLbaOffset * FtwDevice->WorkBlockSize + FtwDevice->FtwWorkSpaceBase) % FtwDevice->SpareBlockSize;

-  DEBUG ((EFI_D_INFO, "Ftw: WorkSpaceLbaInSpare - 0x%lx, WorkSpaceBaseInSpare - 0x%x\n", FtwDevice->FtwWorkSpaceLbaInSpare, FtwDevice->FtwWorkSpaceBaseInSpare));

+  DEBUG ((DEBUG_INFO, "Ftw: WorkSpaceLbaInSpare - 0x%lx, WorkSpaceBaseInSpare - 0x%x\n", FtwDevice->FtwWorkSpaceLbaInSpare, FtwDevice->FtwWorkSpaceBaseInSpare));

 

   //

   // Initialize other parameters, and set WorkSpace as FTW_ERASED_BYTE.

@@ -1274,7 +1274,7 @@ InitFtwProtocol (
     //

     if (IsValidWorkSpace (FtwDevice->FtwWorkSpaceHeader)) {

       Status = FlushSpareBlockToWorkingBlock (FtwDevice);

-      DEBUG ((EFI_D_INFO, "Ftw: Restart working block update in %a() - %r\n",

+      DEBUG ((DEBUG_INFO, "Ftw: Restart working block update in %a() - %r\n",

         __FUNCTION__, Status));

       FtwAbort (&FtwDevice->FtwInstance);

       //

@@ -1283,7 +1283,7 @@ InitFtwProtocol (
       Status = WorkSpaceRefresh (FtwDevice);

       ASSERT_EFI_ERROR (Status);

     } else {

-      DEBUG ((EFI_D_INFO,

+      DEBUG ((DEBUG_INFO,

         "Ftw: Both working and spare blocks are invalid, init workspace\n"));

       //

       // If both are invalid, then initialize work space.

@@ -1309,7 +1309,7 @@ InitFtwProtocol (
     (FtwDevice->FtwLastWriteRecord->SpareComplete != FTW_VALID_STATE) &&

     IsFirstRecordOfWrites (FtwDevice->FtwLastWriteHeader, FtwDevice->FtwLastWriteRecord)

     ) {

-    DEBUG ((EFI_D_ERROR, "Ftw: Init.. find first record not SpareCompleted, abort()\n"));

+    DEBUG ((DEBUG_ERROR, "Ftw: Init.. find first record not SpareCompleted, abort()\n"));

     FtwAbort (&FtwDevice->FtwInstance);

   }

   //

@@ -1320,7 +1320,7 @@ InitFtwProtocol (
     (FtwDevice->FtwLastWriteRecord->DestinationComplete == FTW_VALID_STATE) &&

     IsLastRecordOfWrites (FtwDevice->FtwLastWriteHeader, FtwDevice->FtwLastWriteRecord)

     ) {

-    DEBUG ((EFI_D_ERROR, "Ftw: Init.. find last record completed but header not, abort()\n"));

+    DEBUG ((DEBUG_ERROR, "Ftw: Init.. find last record completed but header not, abort()\n"));

     FtwAbort (&FtwDevice->FtwInstance);

   }

   //

@@ -1346,7 +1346,7 @@ InitFtwProtocol (
     ) {

     if (FtwDevice->FtwLastWriteRecord->BootBlockUpdate == FTW_VALID_STATE) {

       Status = FlushSpareBlockToBootBlock (FtwDevice);

-      DEBUG ((EFI_D_ERROR, "Ftw: Restart boot block update - %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "Ftw: Restart boot block update - %r\n", Status));

       ASSERT_EFI_ERROR (Status);

       FtwAbort (&FtwDevice->FtwInstance);

     } else {

@@ -1357,7 +1357,7 @@ InitFtwProtocol (
       FvbHandle = GetFvbByAddress ((EFI_PHYSICAL_ADDRESS) (UINTN) ((INT64) FtwDevice->SpareAreaAddress + FtwDevice->FtwLastWriteRecord->RelativeOffset), &Fvb);

       if (FvbHandle != NULL) {

         Status = FtwRestart (&FtwDevice->FtwInstance, FvbHandle);

-        DEBUG ((EFI_D_ERROR, "Ftw: Restart last write - %r\n", Status));

+        DEBUG ((DEBUG_ERROR, "Ftw: Restart last write - %r\n", Status));

         ASSERT_EFI_ERROR (Status);

       }

       FtwAbort (&FtwDevice->FtwInstance);

@@ -1375,4 +1375,3 @@ InitFtwProtocol (
 

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
index 04cb38a..703da6d 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
@@ -86,7 +86,7 @@ IsValidWorkSpace (
     return TRUE;

   }

 

-  DEBUG ((EFI_D_INFO, "Ftw: Work block header check mismatch\n"));

+  DEBUG ((DEBUG_INFO, "Ftw: Work block header check mismatch\n"));

   return FALSE;

 }

 

@@ -287,7 +287,7 @@ WorkSpaceRefresh (
             &FtwDevice->FtwLastWriteHeader

             );

   RemainingSpaceSize = FtwDevice->FtwWorkSpaceSize - ((UINTN) FtwDevice->FtwLastWriteHeader - (UINTN) FtwDevice->FtwWorkSpace);

-  DEBUG ((EFI_D_INFO, "Ftw: Remaining work space size - %x\n", RemainingSpaceSize));

+  DEBUG ((DEBUG_INFO, "Ftw: Remaining work space size - %x\n", RemainingSpaceSize));

   //

   // If FtwGetLastWriteHeader() returns error, or the remaining space size is even not enough to contain

   // one EFI_FAULT_TOLERANT_WRITE_HEADER + one EFI_FAULT_TOLERANT_WRITE_RECORD(It will cause that the header

@@ -300,7 +300,7 @@ WorkSpaceRefresh (
     //

     Status = FtwReclaimWorkSpace (FtwDevice, TRUE);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "Ftw: Reclaim workspace - %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "Ftw: Reclaim workspace - %r\n", Status));

       return EFI_ABORTED;

     }

     //

@@ -370,7 +370,7 @@ FtwReclaimWorkSpace (
   UINT8                                   *Ptr;

   EFI_LBA                                 WorkSpaceLbaOffset;

 

-  DEBUG ((EFI_D_INFO, "Ftw: start to reclaim work space\n"));

+  DEBUG ((DEBUG_INFO, "Ftw: start to reclaim work space\n"));

 

   WorkSpaceLbaOffset = FtwDevice->FtwWorkSpaceLba - FtwDevice->FtwWorkBlockLba;

 

@@ -601,7 +601,7 @@ FtwReclaimWorkSpace (
 

   FreePool (SpareBuffer);

 

-  DEBUG ((EFI_D_INFO, "Ftw: reclaim work space successfully\n"));

+  DEBUG ((DEBUG_INFO, "Ftw: reclaim work space successfully\n"));

 

   return EFI_SUCCESS;

 }