SourceLevelDebugPkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the SourceLevelDebugPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

2 files changed, 270 insertions, 254 deletions

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c
index ea3ae33..b32754f 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c
@@ -10,15 +10,14 @@
 

 GLOBAL_REMOVE_IF_UNREFERENCED BOOLEAN  mSkipBreakpoint = FALSE;

 

-

-GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_VECTOR_HANDOFF_INFO_PPI mVectorHandoffInfoPpi = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_VECTOR_HANDOFF_INFO_PPI  mVectorHandoffInfoPpi = {

   &mVectorHandoffInfoDebugAgent[0]

 };

 

 //

 // Ppis to be installed

 //

-GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_PPI_DESCRIPTOR           mVectorHandoffInfoPpiList[] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_PPI_DESCRIPTOR  mVectorHandoffInfoPpiList[] = {

   {

     (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

     &gEfiVectorHandoffInfoPpiGuid,

@@ -26,7 +25,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_PPI_DESCRIPTOR           mVectorHandoffInf
   }

 };

 

-GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_NOTIFY_DESCRIPTOR mDebugAgentMemoryDiscoveredNotifyList[1] = {

+GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_NOTIFY_DESCRIPTOR  mDebugAgentMemoryDiscoveredNotifyList[1] = {

   {

     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

     &gEfiPeiMemoryDiscoveredPpiGuid,

@@ -61,19 +60,19 @@ MultiProcessorDebugSupport (
 **/

 EFI_STATUS

 DebugReadBreakSymbol (

-  IN  DEBUG_PORT_HANDLE      Handle,

-  OUT UINT8                  *BreakSymbol

+  IN  DEBUG_PORT_HANDLE  Handle,

+  OUT UINT8              *BreakSymbol

   )

 {

-  EFI_STATUS                 Status;

-  DEBUG_PACKET_HEADER        DebugHeader;

-  UINT8                      *Data8;

+  EFI_STATUS           Status;

+  DEBUG_PACKET_HEADER  DebugHeader;

+  UINT8                *Data8;

 

   *BreakSymbol = 0;

   //

   // If Debug Port buffer has data, read it till it was break symbol or Debug Port buffer empty.

   //

-  Data8 = (UINT8 *) &DebugHeader;

+  Data8 = (UINT8 *)&DebugHeader;

   while (TRUE) {

     //

     // If start symbol is not received

@@ -84,6 +83,7 @@ DebugReadBreakSymbol (
       //

       break;

     }

+

     //

     // Try to read the start symbol

     //

@@ -93,6 +93,7 @@ DebugReadBreakSymbol (
       DebugAgentMsgPrint (DEBUG_AGENT_INFO, "Debug Timer attach symbol received %x", *BreakSymbol);

       return EFI_SUCCESS;

     }

+

     if (*Data8 == DEBUG_STARTING_SYMBOL_NORMAL) {

       Status = ReadRemainingBreakPacket (Handle, &DebugHeader);

       if (Status == EFI_SUCCESS) {

@@ -100,6 +101,7 @@ DebugReadBreakSymbol (
         DebugAgentMsgPrint (DEBUG_AGENT_INFO, "Debug Timer break symbol received %x", *BreakSymbol);

         return EFI_SUCCESS;

       }

+

       if (Status == EFI_TIMEOUT) {

         break;

       }

@@ -118,13 +120,13 @@ GetLocationSavedMailboxPointerInIdtEntry (
   VOID

   )

 {

-  UINTN                     *MailboxLocation;

+  UINTN  *MailboxLocation;

 

-  MailboxLocation = (UINTN *) GetExceptionHandlerInIdtEntry (DEBUG_MAILBOX_VECTOR);

+  MailboxLocation = (UINTN *)GetExceptionHandlerInIdtEntry (DEBUG_MAILBOX_VECTOR);

   //

   // *MailboxLocation is the pointer to Mailbox

   //

-  VerifyMailboxChecksum ((DEBUG_AGENT_MAILBOX *) (*MailboxLocation));

+  VerifyMailboxChecksum ((DEBUG_AGENT_MAILBOX *)(*MailboxLocation));

   return MailboxLocation;

 }

 

@@ -136,7 +138,7 @@ GetLocationSavedMailboxPointerInIdtEntry (
 **/

 VOID

 SetLocationSavedMailboxPointerInIdtEntry (

-  IN VOID                  *MailboxLocation

+  IN VOID  *MailboxLocation

   )

 {

   SetExceptionHandlerInIdtEntry (DEBUG_MAILBOX_VECTOR, MailboxLocation);

@@ -153,13 +155,14 @@ GetMailboxLocationFromHob (
   VOID

   )

 {

-  EFI_HOB_GUID_TYPE        *GuidHob;

+  EFI_HOB_GUID_TYPE  *GuidHob;

 

   GuidHob = GetFirstGuidHob (&gEfiDebugAgentGuid);

   if (GuidHob == NULL) {

     return NULL;

   }

-  return (UINT64 *) (GET_GUID_HOB_DATA(GuidHob));

+

+  return (UINT64 *)(GET_GUID_HOB_DATA (GuidHob));

 }

 

 /**

@@ -182,12 +185,13 @@ GetMailboxPointer (
   // Get mailbox from IDT entry firstly

   //

   MailboxLocationInIdt = GetLocationSavedMailboxPointerInIdtEntry ();

-  Mailbox = (DEBUG_AGENT_MAILBOX *)(UINTN)(*MailboxLocationInIdt);

+  Mailbox              = (DEBUG_AGENT_MAILBOX *)(UINTN)(*MailboxLocationInIdt);

   //

   // Cannot used GetDebugFlag() to get Debug Flag to avoid GetMailboxPointer() nested

   //

-  if (Mailbox->DebugFlag.Bits.CheckMailboxInHob != 1 ||

-      Mailbox->DebugFlag.Bits.InitArch != DEBUG_ARCH_SYMBOL) {

+  if ((Mailbox->DebugFlag.Bits.CheckMailboxInHob != 1) ||

+      (Mailbox->DebugFlag.Bits.InitArch != DEBUG_ARCH_SYMBOL))

+  {

     //

     // If mailbox was setup in SEC or the current CPU arch is different from the init arch

     // Debug Agent initialized, return the mailbox from IDT entry directly.

@@ -201,12 +205,12 @@ GetMailboxPointer (
   // Compare mailbox in IDT entry with mailbox in HOB,

   // need to fix mailbox location if HOB moved by PEI CORE

   //

-  if (MailboxLocationInHob != MailboxLocationInIdt && MailboxLocationInHob != NULL) {

+  if ((MailboxLocationInHob != MailboxLocationInIdt) && (MailboxLocationInHob != NULL)) {

     Mailbox = (DEBUG_AGENT_MAILBOX *)(UINTN)(*MailboxLocationInHob);

     //

     // Fix up Debug Port handler and save new mailbox in IDT entry

     //

-    Mailbox = (DEBUG_AGENT_MAILBOX *)((UINTN)Mailbox + ((UINTN)(MailboxLocationInHob) - (UINTN)MailboxLocationInIdt));

+    Mailbox         = (DEBUG_AGENT_MAILBOX *)((UINTN)Mailbox + ((UINTN)(MailboxLocationInHob) - (UINTN)MailboxLocationInIdt));

     DebugPortHandle = (UINTN)Mailbox->DebugPortHandle + ((UINTN)(MailboxLocationInHob) - (UINTN)MailboxLocationInIdt);

     UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_PORT_HANDLE_INDEX, DebugPortHandle);

     *MailboxLocationInHob = (UINT64)(UINTN)Mailbox;

@@ -232,11 +236,11 @@ GetDebugPortHandle (
   VOID

   )

 {

-  DEBUG_AGENT_MAILBOX    *DebugAgentMailbox;

+  DEBUG_AGENT_MAILBOX  *DebugAgentMailbox;

 

   DebugAgentMailbox = GetMailboxPointer ();

 

-  return (DEBUG_PORT_HANDLE) (UINTN)(DebugAgentMailbox->DebugPortHandle);

+  return (DEBUG_PORT_HANDLE)(UINTN)(DebugAgentMailbox->DebugPortHandle);

 }

 

 /**

@@ -252,17 +256,17 @@ GetDebugPortHandle (
 EFI_STATUS

 EFIAPI

 DebugAgentCallbackMemoryDiscoveredPpi (

-  IN EFI_PEI_SERVICES                     **PeiServices,

-  IN EFI_PEI_NOTIFY_DESCRIPTOR            *NotifyDescriptor,

-  IN VOID                                 *Ppi

+  IN EFI_PEI_SERVICES           **PeiServices,

+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDescriptor,

+  IN VOID                       *Ppi

   )

 {

-  EFI_STATUS                     Status;

-  DEBUG_AGENT_MAILBOX            *Mailbox;

-  BOOLEAN                        InterruptStatus;

-  EFI_PHYSICAL_ADDRESS           Address;

-  DEBUG_AGENT_MAILBOX            *NewMailbox;

-  UINT64                         *MailboxLocationInHob;

+  EFI_STATUS            Status;

+  DEBUG_AGENT_MAILBOX   *Mailbox;

+  BOOLEAN               InterruptStatus;

+  EFI_PHYSICAL_ADDRESS  Address;

+  DEBUG_AGENT_MAILBOX   *NewMailbox;

+  UINT64                *MailboxLocationInHob;

 

   //

   // Save and disable original interrupt status

@@ -274,11 +278,11 @@ DebugAgentCallbackMemoryDiscoveredPpi (
   //

   Status = PeiServicesAllocatePages (

              EfiACPIMemoryNVS,

-             EFI_SIZE_TO_PAGES (sizeof(DEBUG_AGENT_MAILBOX) + PcdGet16(PcdDebugPortHandleBufferSize)),

+             EFI_SIZE_TO_PAGES (sizeof (DEBUG_AGENT_MAILBOX) + PcdGet16 (PcdDebugPortHandleBufferSize)),

              &Address

              );

   ASSERT_EFI_ERROR (Status);

-  NewMailbox = (DEBUG_AGENT_MAILBOX *) (UINTN) Address;

+  NewMailbox = (DEBUG_AGENT_MAILBOX *)(UINTN)Address;

   //

   // Copy Mailbox and Debug Port Handle buffer to new location in ACPI NVS memory, because original Mailbox

   // and Debug Port Handle buffer in the allocated pool that may be marked as free by DXE Core after DXE Core

@@ -286,7 +290,7 @@ DebugAgentCallbackMemoryDiscoveredPpi (
   //

   Mailbox = GetMailboxPointer ();

   CopyMem (NewMailbox, Mailbox, sizeof (DEBUG_AGENT_MAILBOX));

-  CopyMem (NewMailbox + 1, (VOID *)(UINTN)Mailbox->DebugPortHandle, PcdGet16(PcdDebugPortHandleBufferSize));

+  CopyMem (NewMailbox + 1, (VOID *)(UINTN)Mailbox->DebugPortHandle, PcdGet16 (PcdDebugPortHandleBufferSize));

   //

   // Update Mailbox Location pointer in GUIDed HOB and IDT entry with new one

   //

@@ -375,238 +379,247 @@ InitializeDebugAgent (
   //

   // Disable interrupts and save current interrupt state

   //

-  CpuInterruptState = SaveAndDisableInterrupts();

+  CpuInterruptState = SaveAndDisableInterrupts ();

 

   switch (InitFlag) {

+    case DEBUG_AGENT_INIT_PREMEM_SEC:

 

-  case DEBUG_AGENT_INIT_PREMEM_SEC:

+      InitializeDebugIdt ();

 

-    InitializeDebugIdt ();

+      MailboxLocation = (UINT64)(UINTN)&MailboxInStack;

+      Mailbox         = &MailboxInStack;

+      ZeroMem ((VOID *)Mailbox, sizeof (DEBUG_AGENT_MAILBOX));

+      //

+      // Get and save debug port handle and set the length of memory block.

+      //

+      SetLocationSavedMailboxPointerInIdtEntry (&MailboxLocation);

+      //

+      // Force error message could be printed during the first shakehand between Target/HOST.

+      //

+      SetDebugFlag (DEBUG_AGENT_FLAG_PRINT_ERROR_LEVEL, DEBUG_AGENT_ERROR);

+      //

+      // Save init arch type when debug agent initialized

+      //

+      SetDebugFlag (DEBUG_AGENT_FLAG_INIT_ARCH, DEBUG_ARCH_SYMBOL);

+      //

+      // Initialize Debug Timer hardware and save its frequency

+      //

+      InitializeDebugTimer (&DebugTimerFrequency, TRUE);

+      UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_TIMER_FREQUENCY, DebugTimerFrequency);

 

-    MailboxLocation = (UINT64)(UINTN)&MailboxInStack;

-    Mailbox = &MailboxInStack;

-    ZeroMem ((VOID *) Mailbox, sizeof (DEBUG_AGENT_MAILBOX));

-    //

-    // Get and save debug port handle and set the length of memory block.

-    //

-    SetLocationSavedMailboxPointerInIdtEntry (&MailboxLocation);

-    //

-    // Force error message could be printed during the first shakehand between Target/HOST.

-    //

-    SetDebugFlag (DEBUG_AGENT_FLAG_PRINT_ERROR_LEVEL, DEBUG_AGENT_ERROR);

-    //

-    // Save init arch type when debug agent initialized

-    //

-    SetDebugFlag (DEBUG_AGENT_FLAG_INIT_ARCH, DEBUG_ARCH_SYMBOL);

-    //

-    // Initialize Debug Timer hardware and save its frequency

-    //

-    InitializeDebugTimer (&DebugTimerFrequency, TRUE);

-    UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_TIMER_FREQUENCY, DebugTimerFrequency);

+      Phase2Context.InitFlag = InitFlag;

+      Phase2Context.Context  = Context;

+      Phase2Context.Function = Function;

+      DebugPortInitialize ((VOID *)&Phase2Context, InitializeDebugAgentPhase2);

+      //

+      // If reaches here, it means Debug Port initialization failed.

+      //

+      DEBUG ((DEBUG_ERROR, "Debug Agent: Debug port initialization failed.\n"));

 

-    Phase2Context.InitFlag = InitFlag;

-    Phase2Context.Context  = Context;

-    Phase2Context.Function = Function;

-    DebugPortInitialize ((VOID *) &Phase2Context, InitializeDebugAgentPhase2);

-    //

-    // If reaches here, it means Debug Port initialization failed.

-    //

-    DEBUG ((DEBUG_ERROR, "Debug Agent: Debug port initialization failed.\n"));

+      break;

 

-    break;

+    case DEBUG_AGENT_INIT_POSTMEM_SEC:

+      Mailbox = GetMailboxPointer ();

+      //

+      // Memory has been ready

+      //

+      SetDebugFlag (DEBUG_AGENT_FLAG_MEMORY_READY, 1);

+      if (IsHostAttached ()) {

+        //

+        // Trigger one software interrupt to inform HOST

+        //

+        TriggerSoftInterrupt (MEMORY_READY_SIGNATURE);

+      }

 

-  case DEBUG_AGENT_INIT_POSTMEM_SEC:

-    Mailbox = GetMailboxPointer ();

-    //

-    // Memory has been ready

-    //

-    SetDebugFlag (DEBUG_AGENT_FLAG_MEMORY_READY, 1);

-    if (IsHostAttached ()) {

       //

-      // Trigger one software interrupt to inform HOST

+      // Install Vector Handoff Info PPI to persist vectors used by Debug Agent

       //

-      TriggerSoftInterrupt (MEMORY_READY_SIGNATURE);

-    }

-    //

-    // Install Vector Handoff Info PPI to persist vectors used by Debug Agent

-    //

-    Status = PeiServicesInstallPpi (&mVectorHandoffInfoPpiList[0]);

-    if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_ERROR, "DebugAgent: Failed to install Vector Handoff Info PPI!\n"));

-      CpuDeadLoop ();

-    }

-    //

-    // Fix up Debug Port handle address and mailbox address

-    //

-    DebugAgentContext = (DEBUG_AGENT_CONTEXT_POSTMEM_SEC *) Context;

-    if (DebugAgentContext != NULL) {

-      DebugPortHandle = (UINT64)(UINT32)(Mailbox->DebugPortHandle + DebugAgentContext->StackMigrateOffset);

-      UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_PORT_HANDLE_INDEX, DebugPortHandle);

-      Mailbox = (DEBUG_AGENT_MAILBOX *) ((UINTN) Mailbox + DebugAgentContext->StackMigrateOffset);

-      MailboxLocation = (UINT64)(UINTN)Mailbox;

-      //

-      // Build mailbox location in HOB and fix-up its address

-      //

-      MailboxLocationPointer = BuildGuidDataHob (

-                                 &gEfiDebugAgentGuid,

-                                 &MailboxLocation,

-                                 sizeof (UINT64)

-                                 );

-      MailboxLocationPointer = (UINT64 *) ((UINTN) MailboxLocationPointer + DebugAgentContext->HeapMigrateOffset);

-    } else {

-      //

-      // DebugAgentContext is NULL. Then, Mailbox can directly be copied into memory.

-      // Allocate ACPI NVS memory for new Mailbox and Debug Port Handle buffer

-      //

-      Status = PeiServicesAllocatePages (

-                 EfiACPIMemoryNVS,

-                 EFI_SIZE_TO_PAGES (sizeof(DEBUG_AGENT_MAILBOX) + PcdGet16(PcdDebugPortHandleBufferSize)),

-                 &Address

-                 );

+      Status = PeiServicesInstallPpi (&mVectorHandoffInfoPpiList[0]);

       if (EFI_ERROR (Status)) {

-        DEBUG ((DEBUG_ERROR, "DebugAgent: Failed to allocate pages!\n"));

+        DEBUG ((DEBUG_ERROR, "DebugAgent: Failed to install Vector Handoff Info PPI!\n"));

         CpuDeadLoop ();

       }

-      NewMailbox = (DEBUG_AGENT_MAILBOX *) (UINTN) Address;

-      //

-      // Copy Mailbox and Debug Port Handle buffer to new location in ACPI NVS memory, because original Mailbox

-      // and Debug Port Handle buffer in the allocated pool that may be marked as free by DXE Core after DXE Core

-      // reallocates the HOB.

-      //

-      CopyMem (NewMailbox, Mailbox, sizeof (DEBUG_AGENT_MAILBOX));

-      CopyMem (NewMailbox + 1, (VOID *)(UINTN)Mailbox->DebugPortHandle, PcdGet16(PcdDebugPortHandleBufferSize));

-      UpdateMailboxContent (NewMailbox, DEBUG_MAILBOX_DEBUG_PORT_HANDLE_INDEX, (UINT64)(UINTN)(NewMailbox + 1));

-      MailboxLocation = (UINT64)(UINTN)NewMailbox;

-      //

-      // Build mailbox location in HOB

-      //

-      MailboxLocationPointer = BuildGuidDataHob (

-                                 &gEfiDebugAgentGuid,

-                                 &MailboxLocation,

-                                 sizeof (UINT64)

-                                 );

-    }

-    //

-    // Update IDT entry to save the location saved mailbox pointer

-    //

-    SetLocationSavedMailboxPointerInIdtEntry (MailboxLocationPointer);

-    break;

 

-  case DEBUG_AGENT_INIT_PEI:

-    if (Context == NULL) {

-      DEBUG ((DEBUG_ERROR, "DebugAgent: Input parameter Context cannot be NULL!\n"));

-      CpuDeadLoop ();

-    }

-    //

-    // Check if Debug Agent has initialized before

-    //

-    if (IsDebugAgentInitialzed()) {

-      DEBUG ((DEBUG_WARN, "Debug Agent: It has already initialized in SEC Core!\n"));

-      break;

-    }

-    //

-    // Install Vector Handoff Info PPI to persist vectors used by Debug Agent

-    //

-    Status = PeiServicesInstallPpi (&mVectorHandoffInfoPpiList[0]);

-    if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_ERROR, "DebugAgent: Failed to install Vector Handoff Info PPI!\n"));

-      CpuDeadLoop ();

-    }

-    //

-    // Set up IDT entries

-    //

-    InitializeDebugIdt ();

-    //

-    // Build mailbox in HOB and setup Mailbox Set In Pei flag

-    //

-    Mailbox = AllocateZeroPool (sizeof (DEBUG_AGENT_MAILBOX));

-    if (Mailbox == NULL) {

-      DEBUG ((DEBUG_ERROR, "DebugAgent: Failed to allocate memory!\n"));

-      CpuDeadLoop ();

-    } else {

-      MailboxLocation = (UINT64)(UINTN)Mailbox;

-      MailboxLocationPointer = BuildGuidDataHob (

-                                 &gEfiDebugAgentGuid,

-                                 &MailboxLocation,

-                                 sizeof (UINT64)

-                                 );

       //

-      // Initialize Debug Timer hardware and save its frequency

+      // Fix up Debug Port handle address and mailbox address

       //

-      InitializeDebugTimer (&DebugTimerFrequency, TRUE);

-      UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_TIMER_FREQUENCY, DebugTimerFrequency);

+      DebugAgentContext = (DEBUG_AGENT_CONTEXT_POSTMEM_SEC *)Context;

+      if (DebugAgentContext != NULL) {

+        DebugPortHandle = (UINT64)(UINT32)(Mailbox->DebugPortHandle + DebugAgentContext->StackMigrateOffset);

+        UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_PORT_HANDLE_INDEX, DebugPortHandle);

+        Mailbox         = (DEBUG_AGENT_MAILBOX *)((UINTN)Mailbox + DebugAgentContext->StackMigrateOffset);

+        MailboxLocation = (UINT64)(UINTN)Mailbox;

+        //

+        // Build mailbox location in HOB and fix-up its address

+        //

+        MailboxLocationPointer = BuildGuidDataHob (

+                                   &gEfiDebugAgentGuid,

+                                   &MailboxLocation,

+                                   sizeof (UINT64)

+                                   );

+        MailboxLocationPointer = (UINT64 *)((UINTN)MailboxLocationPointer + DebugAgentContext->HeapMigrateOffset);

+      } else {

+        //

+        // DebugAgentContext is NULL. Then, Mailbox can directly be copied into memory.

+        // Allocate ACPI NVS memory for new Mailbox and Debug Port Handle buffer

+        //

+        Status = PeiServicesAllocatePages (

+                   EfiACPIMemoryNVS,

+                   EFI_SIZE_TO_PAGES (sizeof (DEBUG_AGENT_MAILBOX) + PcdGet16 (PcdDebugPortHandleBufferSize)),

+                   &Address

+                   );

+        if (EFI_ERROR (Status)) {

+          DEBUG ((DEBUG_ERROR, "DebugAgent: Failed to allocate pages!\n"));

+          CpuDeadLoop ();

+        }

+

+        NewMailbox = (DEBUG_AGENT_MAILBOX *)(UINTN)Address;

+        //

+        // Copy Mailbox and Debug Port Handle buffer to new location in ACPI NVS memory, because original Mailbox

+        // and Debug Port Handle buffer in the allocated pool that may be marked as free by DXE Core after DXE Core

+        // reallocates the HOB.

+        //

+        CopyMem (NewMailbox, Mailbox, sizeof (DEBUG_AGENT_MAILBOX));

+        CopyMem (NewMailbox + 1, (VOID *)(UINTN)Mailbox->DebugPortHandle, PcdGet16 (PcdDebugPortHandleBufferSize));

+        UpdateMailboxContent (NewMailbox, DEBUG_MAILBOX_DEBUG_PORT_HANDLE_INDEX, (UINT64)(UINTN)(NewMailbox + 1));

+        MailboxLocation = (UINT64)(UINTN)NewMailbox;

+        //

+        // Build mailbox location in HOB

+        //

+        MailboxLocationPointer = BuildGuidDataHob (

+                                   &gEfiDebugAgentGuid,

+                                   &MailboxLocation,

+                                   sizeof (UINT64)

+                                   );

+      }

+

       //

-      // Update IDT entry to save the location pointer saved mailbox pointer

+      // Update IDT entry to save the location saved mailbox pointer

       //

       SetLocationSavedMailboxPointerInIdtEntry (MailboxLocationPointer);

-    }

-    //

-    // Save init arch type when debug agent initialized

-    //

-    SetDebugFlag (DEBUG_AGENT_FLAG_INIT_ARCH, DEBUG_ARCH_SYMBOL);

-    //

-    // Register for a callback once memory has been initialized.

-    // If memory has been ready, the callback function will be invoked immediately

-    //

-    Status = PeiServicesNotifyPpi (&mDebugAgentMemoryDiscoveredNotifyList[0]);

-    if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_ERROR, "DebugAgent: Failed to register memory discovered callback function!\n"));

-      CpuDeadLoop ();

-    }

-    //

-    // Set HOB check flag if memory has not been ready yet

-    //

-    if (GetDebugFlag (DEBUG_AGENT_FLAG_MEMORY_READY) == 0) {

-      SetDebugFlag (DEBUG_AGENT_FLAG_CHECK_MAILBOX_IN_HOB, 1);

-    }

-

-    Phase2Context.InitFlag = InitFlag;

-    Phase2Context.Context  = Context;

-    Phase2Context.Function = Function;

-    DebugPortInitialize ((VOID *) &Phase2Context, InitializeDebugAgentPhase2);

+      break;

 

-    FindAndReportModuleImageInfo (4);

+    case DEBUG_AGENT_INIT_PEI:

+      if (Context == NULL) {

+        DEBUG ((DEBUG_ERROR, "DebugAgent: Input parameter Context cannot be NULL!\n"));

+        CpuDeadLoop ();

+      }

 

-    break;

+      //

+      // Check if Debug Agent has initialized before

+      //

+      if (IsDebugAgentInitialzed ()) {

+        DEBUG ((DEBUG_WARN, "Debug Agent: It has already initialized in SEC Core!\n"));

+        break;

+      }

 

-  case DEBUG_AGENT_INIT_THUNK_PEI_IA32TOX64:

-    if (Context == NULL) {

-      DEBUG ((DEBUG_ERROR, "DebugAgent: Input parameter Context cannot be NULL!\n"));

-      CpuDeadLoop ();

-    } else {

-      Ia32Idtr =  (IA32_DESCRIPTOR *) Context;

-      Ia32IdtEntry = (IA32_IDT_ENTRY *)(Ia32Idtr->Base);

-      MailboxLocationPointer = (UINT64 *) ((UINTN) Ia32IdtEntry[DEBUG_MAILBOX_VECTOR].Bits.OffsetLow +

-                                          ((UINTN) Ia32IdtEntry[DEBUG_MAILBOX_VECTOR].Bits.OffsetHigh << 16));

-      Mailbox = (DEBUG_AGENT_MAILBOX *) (UINTN)(*MailboxLocationPointer);

       //

-      // Mailbox should valid and setup before executing thunk code

+      // Install Vector Handoff Info PPI to persist vectors used by Debug Agent

       //

-      VerifyMailboxChecksum (Mailbox);

+      Status = PeiServicesInstallPpi (&mVectorHandoffInfoPpiList[0]);

+      if (EFI_ERROR (Status)) {

+        DEBUG ((DEBUG_ERROR, "DebugAgent: Failed to install Vector Handoff Info PPI!\n"));

+        CpuDeadLoop ();

+      }

 

-      DebugPortHandle = (UINT64) (UINTN)DebugPortInitialize ((VOID *)(UINTN)Mailbox->DebugPortHandle, NULL);

-      UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_PORT_HANDLE_INDEX, DebugPortHandle);

       //

       // Set up IDT entries

       //

       InitializeDebugIdt ();

       //

-      // Update IDT entry to save location pointer saved the mailbox pointer

+      // Build mailbox in HOB and setup Mailbox Set In Pei flag

       //

-      SetLocationSavedMailboxPointerInIdtEntry (MailboxLocationPointer);

+      Mailbox = AllocateZeroPool (sizeof (DEBUG_AGENT_MAILBOX));

+      if (Mailbox == NULL) {

+        DEBUG ((DEBUG_ERROR, "DebugAgent: Failed to allocate memory!\n"));

+        CpuDeadLoop ();

+      } else {

+        MailboxLocation        = (UINT64)(UINTN)Mailbox;

+        MailboxLocationPointer = BuildGuidDataHob (

+                                   &gEfiDebugAgentGuid,

+                                   &MailboxLocation,

+                                   sizeof (UINT64)

+                                   );

+        //

+        // Initialize Debug Timer hardware and save its frequency

+        //

+        InitializeDebugTimer (&DebugTimerFrequency, TRUE);

+        UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_TIMER_FREQUENCY, DebugTimerFrequency);

+        //

+        // Update IDT entry to save the location pointer saved mailbox pointer

+        //

+        SetLocationSavedMailboxPointerInIdtEntry (MailboxLocationPointer);

+      }

+

+      //

+      // Save init arch type when debug agent initialized

+      //

+      SetDebugFlag (DEBUG_AGENT_FLAG_INIT_ARCH, DEBUG_ARCH_SYMBOL);

+      //

+      // Register for a callback once memory has been initialized.

+      // If memory has been ready, the callback function will be invoked immediately

+      //

+      Status = PeiServicesNotifyPpi (&mDebugAgentMemoryDiscoveredNotifyList[0]);

+      if (EFI_ERROR (Status)) {

+        DEBUG ((DEBUG_ERROR, "DebugAgent: Failed to register memory discovered callback function!\n"));

+        CpuDeadLoop ();

+      }

+

+      //

+      // Set HOB check flag if memory has not been ready yet

+      //

+      if (GetDebugFlag (DEBUG_AGENT_FLAG_MEMORY_READY) == 0) {

+        SetDebugFlag (DEBUG_AGENT_FLAG_CHECK_MAILBOX_IN_HOB, 1);

+      }

+

+      Phase2Context.InitFlag = InitFlag;

+      Phase2Context.Context  = Context;

+      Phase2Context.Function = Function;

+      DebugPortInitialize ((VOID *)&Phase2Context, InitializeDebugAgentPhase2);

 

       FindAndReportModuleImageInfo (4);

-    }

-    break;

 

-  default:

-    //

-    // Only DEBUG_AGENT_INIT_PREMEM_SEC and DEBUG_AGENT_INIT_POSTMEM_SEC are allowed for this

-    // Debug Agent library instance.

-    //

-    DEBUG ((DEBUG_ERROR, "Debug Agent: The InitFlag value is not allowed!\n"));

-    CpuDeadLoop ();

-    break;

+      break;

+

+    case DEBUG_AGENT_INIT_THUNK_PEI_IA32TOX64:

+      if (Context == NULL) {

+        DEBUG ((DEBUG_ERROR, "DebugAgent: Input parameter Context cannot be NULL!\n"));

+        CpuDeadLoop ();

+      } else {

+        Ia32Idtr               =  (IA32_DESCRIPTOR *)Context;

+        Ia32IdtEntry           = (IA32_IDT_ENTRY *)(Ia32Idtr->Base);

+        MailboxLocationPointer = (UINT64 *)((UINTN)Ia32IdtEntry[DEBUG_MAILBOX_VECTOR].Bits.OffsetLow +

+                                            ((UINTN)Ia32IdtEntry[DEBUG_MAILBOX_VECTOR].Bits.OffsetHigh << 16));

+        Mailbox = (DEBUG_AGENT_MAILBOX *)(UINTN)(*MailboxLocationPointer);

+        //

+        // Mailbox should valid and setup before executing thunk code

+        //

+        VerifyMailboxChecksum (Mailbox);

+

+        DebugPortHandle = (UINT64)(UINTN)DebugPortInitialize ((VOID *)(UINTN)Mailbox->DebugPortHandle, NULL);

+        UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_PORT_HANDLE_INDEX, DebugPortHandle);

+        //

+        // Set up IDT entries

+        //

+        InitializeDebugIdt ();

+        //

+        // Update IDT entry to save location pointer saved the mailbox pointer

+        //

+        SetLocationSavedMailboxPointerInIdtEntry (MailboxLocationPointer);

+

+        FindAndReportModuleImageInfo (4);

+      }

+

+      break;

+

+    default:

+      //

+      // Only DEBUG_AGENT_INIT_PREMEM_SEC and DEBUG_AGENT_INIT_POSTMEM_SEC are allowed for this

+      // Debug Agent library instance.

+      //

+      DEBUG ((DEBUG_ERROR, "Debug Agent: The InitFlag value is not allowed!\n"));

+      CpuDeadLoop ();

+      break;

   }

 

   if (InitFlag == DEBUG_AGENT_INIT_POSTMEM_SEC) {

@@ -625,16 +638,18 @@ InitializeDebugAgent (
     //

     EnableInterrupts ();

   }

+

   //

   // If Function is not NULL, invoke it always whatever debug agent was initialized successfully or not.

   //

   if (Function != NULL) {

     Function (Context);

   }

+

   //

   // Set return status for DEBUG_AGENT_INIT_PEI

   //

-  if (InitFlag == DEBUG_AGENT_INIT_PEI && Context != NULL) {

+  if ((InitFlag == DEBUG_AGENT_INIT_PEI) && (Context != NULL)) {

     *(EFI_STATUS *)Context = EFI_SUCCESS;

   }

 }

@@ -651,26 +666,27 @@ InitializeDebugAgent (
 VOID

 EFIAPI

 InitializeDebugAgentPhase2 (

-  IN VOID                  *Context,

-  IN DEBUG_PORT_HANDLE     DebugPortHandle

+  IN VOID               *Context,

+  IN DEBUG_PORT_HANDLE  DebugPortHandle

   )

 {

-  DEBUG_AGENT_PHASE2_CONTEXT *Phase2Context;

-  UINT64                     *MailboxLocation;

-  DEBUG_AGENT_MAILBOX        *Mailbox;

-  EFI_SEC_PEI_HAND_OFF       *SecCoreData;

-  UINT16                     BufferSize;

-  UINT64                     NewDebugPortHandle;

-

-  Phase2Context = (DEBUG_AGENT_PHASE2_CONTEXT *) Context;

+  DEBUG_AGENT_PHASE2_CONTEXT  *Phase2Context;

+  UINT64                      *MailboxLocation;

+  DEBUG_AGENT_MAILBOX         *Mailbox;

+  EFI_SEC_PEI_HAND_OFF        *SecCoreData;

+  UINT16                      BufferSize;

+  UINT64                      NewDebugPortHandle;

+

+  Phase2Context   = (DEBUG_AGENT_PHASE2_CONTEXT *)Context;

   MailboxLocation = GetLocationSavedMailboxPointerInIdtEntry ();

-  Mailbox = (DEBUG_AGENT_MAILBOX *)(UINTN)(*MailboxLocation);

-  BufferSize = PcdGet16(PcdDebugPortHandleBufferSize);

-  if (Phase2Context->InitFlag == DEBUG_AGENT_INIT_PEI && BufferSize != 0) {

+  Mailbox         = (DEBUG_AGENT_MAILBOX *)(UINTN)(*MailboxLocation);

+  BufferSize      = PcdGet16 (PcdDebugPortHandleBufferSize);

+  if ((Phase2Context->InitFlag == DEBUG_AGENT_INIT_PEI) && (BufferSize != 0)) {

     NewDebugPortHandle = (UINT64)(UINTN)AllocateCopyPool (BufferSize, DebugPortHandle);

   } else {

     NewDebugPortHandle = (UINT64)(UINTN)DebugPortHandle;

   }

+

   UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_PORT_HANDLE_INDEX, NewDebugPortHandle);

 

   //

@@ -684,10 +700,11 @@ InitializeDebugAgentPhase2 (
     // host to disable low memory filtering.

     //

     SecCoreData = (EFI_SEC_PEI_HAND_OFF *)Phase2Context->Context;

-    if ((UINTN)SecCoreData->TemporaryRamBase < BASE_128MB && IsHostAttached ()) {

+    if (((UINTN)SecCoreData->TemporaryRamBase < BASE_128MB) && IsHostAttached ()) {

       SetDebugFlag (DEBUG_AGENT_FLAG_MEMORY_READY, 1);

       TriggerSoftInterrupt (MEMORY_READY_SIGNATURE);

     }

+

     //

     // Enable Debug Timer interrupt

     //

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.h b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.h
index 5ebc0a4..9693488 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.h
+++ b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.h
@@ -33,8 +33,8 @@ typedef struct {
 VOID

 EFIAPI

 InitializeDebugAgentPhase2 (

-  IN VOID                  *Context,

-  IN DEBUG_PORT_HANDLE     DebugPortHandle

+  IN VOID               *Context,

+  IN DEBUG_PORT_HANDLE  DebugPortHandle

   );

 

 /**

@@ -50,10 +50,9 @@ InitializeDebugAgentPhase2 (
 EFI_STATUS

 EFIAPI

 DebugAgentCallbackMemoryDiscoveredPpi (

-  IN EFI_PEI_SERVICES                     **PeiServices,

-  IN EFI_PEI_NOTIFY_DESCRIPTOR            *NotifyDescriptor,

-  IN VOID                                 *Ppi

+  IN EFI_PEI_SERVICES           **PeiServices,

+  IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDescriptor,

+  IN VOID                       *Ppi

   );

 

 #endif

-