SourceLevelDebugPkg/DebugTimer: Dump Debug Timer parameter

Add one parameter DumpFlag to indicate if need to dump Local APIC time's
parameter.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17501 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
index 10dd302694bb19d74c0df114207c4c52ec01a014..3eca30497f8bf2896d2b2a8216b9004f77b0bb76 100644 (file)
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
@@ -2534,7 +2534,7 @@ InterruptProcess (
         //\r
         CurrentDebugTimerInitCount = GetApicTimerInitCount ();\r
         if (mDebugMpContext.DebugTimerInitCount != CurrentDebugTimerInitCount) {\r
-          InitializeDebugTimer (NULL);\r
+          InitializeDebugTimer (NULL, FALSE);\r
         }\r
       }\r
 \r

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.c
index 0a60e7d8574603ea0342f0a76ed42cde997add98..25d64685889288eb029fe43df27aeda55f3a1969 100644 (file)
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.c
@@ -18,12 +18,14 @@
   Initialize CPU local APIC timer.\r
 \r
   @param[out] TimerFrequency  Local APIC timer frequency returned.\r
+  @param[in]  DumpFlag        If TRUE, dump Local APIC timer's parameter.\r
  \r
   @return   32-bit Local APIC timer init count.\r
 **/\r
 UINT32\r
 InitializeDebugTimer (\r
-  OUT UINT32     *TimerFrequency\r
+  OUT UINT32     *TimerFrequency,\r
+  IN  BOOLEAN    DumpFlag\r
   )\r
 {\r
   UINTN       ApicTimerDivisor;\r
@@ -45,11 +47,12 @@ InitializeDebugTimer (
 \r
   InitializeApicTimer (ApicTimerDivisor, InitialCount, TRUE, DEBUG_TIMER_VECTOR);\r
 \r
-  DEBUG ((EFI_D_INFO, "Debug Timer: FSB Clock    = %d\n", PcdGet32(PcdFSBClock))); \r
-  DEBUG ((EFI_D_INFO, "Debug Timer: Divisor      = %d\n", ApicTimerDivisor)); \r
-  DEBUG ((EFI_D_INFO, "Debug Timer: Frequency    = %d\n", ApicTimerFrequency)); \r
-  DEBUG ((EFI_D_INFO, "Debug Timer: InitialCount = %d\n", InitialCount)); \r
-\r
+  if (DumpFlag) {\r
+    DEBUG ((EFI_D_INFO, "Debug Timer: FSB Clock    = %d\n", PcdGet32(PcdFSBClock)));\r
+    DEBUG ((EFI_D_INFO, "Debug Timer: Divisor      = %d\n", ApicTimerDivisor));\r
+    DEBUG ((EFI_D_INFO, "Debug Timer: Frequency    = %d\n", ApicTimerFrequency));\r
+    DEBUG ((EFI_D_INFO, "Debug Timer: InitialCount = %d\n", InitialCount));\r
+  }\r
   if (TimerFrequency != NULL) {\r
     *TimerFrequency = ApicTimerFrequency;\r
   }\r

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.h b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.h
index 021d67e11a81379bef08b98a1cf7c99797c7e95c..60550d42cfe33aaa47e6fd1c9773dabb7f84347c 100644 (file)
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.h
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.h
@@ -19,12 +19,14 @@
   Initialize CPU local APIC timer.\r
 \r
   @param[out] TimerFrequency  Local APIC timer frequency returned.\r
+  @param[in]  DumpFlag        If TRUE, dump Local APIC timer's parameter.\r
  \r
   @return   32-bit Local APIC timer init count.\r
 **/\r
 UINT32\r
 InitializeDebugTimer (\r
-  OUT UINT32     *TimerFrequency\r
+  OUT UINT32     *TimerFrequency,\r
+  IN  BOOLEAN    DumpFlag\r
   );\r
 \r
 /**\r

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c
index 8fa0f5c545b8136837a9012bc294ce3862aaec07..aaf342e0ba85f9d3bb952e4a2a3d68e3a89824be 100644 (file)
--- a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgent/DxeDebugAgentLib.c
@@ -306,7 +306,7 @@ SetupDebugAgentEnvironment (
   //\r
   // Initialize Debug Timer hardware and save its initial count and frequency\r
   //\r
-  mDebugMpContext.DebugTimerInitCount = InitializeDebugTimer (&DebugTimerFrequency);\r
+  mDebugMpContext.DebugTimerInitCount = InitializeDebugTimer (&DebugTimerFrequency, TRUE);\r
   UpdateMailboxContent (mMailboxPointer, DEBUG_MAILBOX_DEBUG_TIMER_FREQUENCY, DebugTimerFrequency);\r
   //\r
   // Initialize debug communication port\r

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c
index f71ddadb1a1b78d6767a91e393bd77da43bd2b83..fba41eecb71f98da5dffc0e0db18709d176f5edf 100644 (file)
--- a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c
@@ -403,7 +403,7 @@ InitializeDebugAgent (
     //\r
     // Initialize Debug Timer hardware and save its frequency\r
     //\r
-    InitializeDebugTimer (&DebugTimerFrequency);\r
+    InitializeDebugTimer (&DebugTimerFrequency, TRUE);\r
     UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_TIMER_FREQUENCY, DebugTimerFrequency);\r
 \r
     Phase2Context.InitFlag = InitFlag;\r
@@ -535,7 +535,7 @@ InitializeDebugAgent (
       //\r
       // Initialize Debug Timer hardware and save its frequency\r
       //\r
-      InitializeDebugTimer (&DebugTimerFrequency);\r
+      InitializeDebugTimer (&DebugTimerFrequency, TRUE);\r
       UpdateMailboxContent (Mailbox, DEBUG_MAILBOX_DEBUG_TIMER_FREQUENCY, DebugTimerFrequency);\r
       //\r
       // Update IDT entry to save the location pointer saved mailbox pointer\r

diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
index 544067b4d6e014d1eb4758e325dbc70b14edff0f..72db534844987ec986fa31a1c33cc3113358be4f 100644 (file)
--- a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c
@@ -242,7 +242,7 @@ InitializeDebugAgent (
     //\r
     // Initialize Debug Timer hardware and save its frequency\r
     //\r
-    InitializeDebugTimer (&DebugTimerFrequency);\r
+    InitializeDebugTimer (&DebugTimerFrequency, TRUE);\r
     UpdateMailboxContent (mMailboxPointer, DEBUG_MAILBOX_DEBUG_TIMER_FREQUENCY, DebugTimerFrequency);\r
 \r
     DebugPortHandle = (UINT64) (UINTN)DebugPortInitialize ((DEBUG_PORT_HANDLE) (UINTN)Mailbox->DebugPortHandle, NULL);\r
@@ -283,7 +283,7 @@ InitializeDebugAgent (
     GetApicTimerState (NULL, &PeriodicMode, NULL);\r
     TimerCycle = GetApicTimerInitCount ();\r
     if (PeriodicMode != TRUE || TimerCycle == 0) {\r
-      InitializeDebugTimer (NULL);\r
+      InitializeDebugTimer (NULL, FALSE);\r
       DisableApicTimerInterrupt ();\r
     }\r
     Mailbox = GetMailboxPointer ();\r
@@ -348,7 +348,7 @@ InitializeDebugAgent (
       //\r
       // Initialize Debug Timer hardware and save its frequency\r
       //\r
-      InitializeDebugTimer (&DebugTimerFrequency);\r
+      InitializeDebugTimer (&DebugTimerFrequency, TRUE);\r
       UpdateMailboxContent (mMailboxPointer, DEBUG_MAILBOX_DEBUG_TIMER_FREQUENCY, DebugTimerFrequency);\r
       EnableInterrupts ();\r
 \r