Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.c

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.c (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/Firmware/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugTimer.c

@@ -2 +2 @@
   Code for debug timer to support debug agent library implementation.
 
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -18 +18 @@
   Initialize CPU local APIC timer.
 
+  @return   32-bit Local APIC timer init count.
 **/
-VOID
+UINT32
 InitializeDebugTimer (
   VOID
@@ -42 +43 @@
   InitializeApicTimer (ApicTimerDivisor, InitialCount, TRUE, DEBUG_TIMER_VECTOR);
 
-  if (MultiProcessorDebugSupport) {
-    mDebugMpContext.DebugTimerInitCount = InitialCount;
-  }
+  return InitialCount;
 }
 
@@ -66 +65 @@
   )
 {
-  BOOLEAN     OldInterruptState;
   BOOLEAN     OldDebugTimerInterruptState;
 
-  OldInterruptState = SaveAndDisableInterrupts ();
   OldDebugTimerInterruptState = GetApicTimerInterruptState ();
-  
-  if (EnableStatus) {
-    EnableApicTimerInterrupt ();
-  } else {
-    DisableApicTimerInterrupt ();
+
+  if (OldDebugTimerInterruptState != EnableStatus) {
+    if (EnableStatus) {
+      EnableApicTimerInterrupt ();
+    } else {
+      DisableApicTimerInterrupt ();
+    }
+    //
+    // Validate the Debug Timer interrupt state
+    // This will make additional delay after Local Apic Timer interrupt state is changed.
+    // Thus, CPU could handle the potential pending interrupt of Local Apic timer.
+    //
+    while (GetApicTimerInterruptState () != EnableStatus) {
+      CpuPause ();
+    }
   }
 
-  SetInterruptState (OldInterruptState);
   return OldDebugTimerInterruptState;
 }