SourceLevelDebugPkg: Update SmmDebugAgentLib to restore APIC timer

In enter SMI, APIC timer may be initialized. After exit SMI, APIC timer
will be restore.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

1 files changed, 16 insertions, 5 deletions

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
index 11afd329fa..6be8c54425 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
@@ -20,6 +20,11 @@ UINTN                       mSavedDebugRegisters[6];
 IA32_IDT_GATE_DESCRIPTOR    mIdtEntryTable[33];

 BOOLEAN                     mSkipBreakpoint = FALSE;

 BOOLEAN                     mSmmDebugIdtInitFlag = FALSE;

+BOOLEAN                     mApicTimerRestore = FALSE;

+BOOLEAN                     mPeriodicMode;

+UINT32                      mTimerCycle;

+UINTN                       mApicTimerDivisor;

+UINT8                       mVector;

 

 CHAR8 mWarningMsgIgnoreSmmEntryBreak[] = "Ignore smmentrybreak setting for SMI issued during DXE debugging!\r\n";

 

@@ -191,8 +196,6 @@ InitializeDebugAgent (
   DEBUG_AGENT_MAILBOX           *Mailbox;

   UINT64                        *MailboxLocation;

   UINT32                        DebugTimerFrequency;

-  BOOLEAN                       PeriodicMode;

-  UINTN                         TimerCycle;

 

   switch (InitFlag) {

   case DEBUG_AGENT_INIT_SMM:

@@ -289,9 +292,10 @@ InitializeDebugAgent (
     // Check if CPU APIC Timer is working, otherwise initialize it.

     //

     InitializeLocalApicSoftwareEnable (TRUE);

-    GetApicTimerState (NULL, &PeriodicMode, NULL);

-    TimerCycle = GetApicTimerInitCount ();

-    if (!PeriodicMode || TimerCycle == 0) {

+    GetApicTimerState (&mApicTimerDivisor, &mPeriodicMode, &mVector);

+    mTimerCycle = GetApicTimerInitCount ();

+    if (!mPeriodicMode || mTimerCycle == 0) {

+      mApicTimerRestore = TRUE;

       InitializeDebugTimer (NULL, FALSE);

     }

     Mailbox = GetMailboxPointer ();

@@ -327,6 +331,13 @@ InitializeDebugAgent (
     //

     mSkipBreakpoint = FALSE;

     RestoreDebugRegister ();

+    //

+    // Restore APIC Timer

+    //

+    if (mApicTimerRestore) {

+      InitializeApicTimer (mApicTimerDivisor, mTimerCycle, mPeriodicMode, mVector);

+      mApicTimerRestore = FALSE;

+    }

     break;

 

   case DEBUG_AGENT_INIT_THUNK_PEI_IA32TOX64: