1 files changed, 6 insertions, 1 deletions
diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 2f72670c2a..2cf082b74f 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -244,7 +244,7 @@ DxeMain (
   //
   // Initialize Debug Agent to support source level debug in DXE phase
   //
-  InitializeDebugAgent (DEBUG_AGENT_INIT_DXE, HobStart);
+  InitializeDebugAgent (DEBUG_AGENT_INIT_DXE_CORE, HobStart);
 
   //
   // Initialize Memory Services
@@ -686,6 +686,11 @@ CoreExitBootServices (
   CoreNotifySignalList (&gEfiEventExitBootServicesGuid);
 
   //
+  // Disable interrupt of Debug timer.
+  //
+  SaveAndSetDebugTimerInterrupt (FALSE);
+
+  //
   // Disable CPU Interrupts
   //
   gCpu->DisableInterrupt (gCpu);