Changeset 105670 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/PcAtChipsetPkg

Timestamp:

Aug 14, 2024 1:16:30 PM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

164367

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable-202405 and make it build on aarch64, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• PcAtChipsetPkg/HpetTimerDxe/HpetTimer.c (modified) (1 diff)
• PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c (modified) (5 diffs)
• PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtcEntry.c (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/PcAtChipsetPkg/HpetTimerDxe/HpetTimer.c

@@ -389 +389 @@
 
     //
+    // Save main counter value before calling notification function
+    // that may enable interrupts and allow interrupt nesting.
+    //
+    mPreviousMainCounter = MainCounter;
+
+    //
     // Call registered notification function passing in the time since the last
     // interrupt in 100 ns units.
     //
     mTimerNotifyFunction (TimerPeriod);
+    return;
   }
 

trunk/src/VBox/Devices/EFI/FirmwareNew/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c

@@ -2 +2 @@
   ACPI Timer implements one instance of Timer Library.
 
-  Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2013 - 2023, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -11 +11 @@
 #include <Library/BaseLib.h>
 #include <Library/HobLib.h>
+
+//
+// Cached performance counter frequency
+//
+static UINT64  mAcpiTimerLibTscFrequency = 0;
 
 extern GUID  mFrequencyHobGuid;
@@ -49 +54 @@
   );
 
-//
-// Cached performance counter frequency
-//
-UINT64  mPerformanceCounterFrequency = 0;
-
 /**
   Internal function to retrieves the 64-bit frequency in Hz.
@@ -67 +67 @@
   )
 {
-  return mPerformanceCounterFrequency;
+  return mAcpiTimerLibTscFrequency;
 }
 
@@ -93 +93 @@
   GuidHob = GetFirstGuidHob (&mFrequencyHobGuid);
   if (GuidHob != NULL) {
-    mPerformanceCounterFrequency = *(UINT64 *)GET_GUID_HOB_DATA (GuidHob);
+    mAcpiTimerLibTscFrequency = *(UINT64 *)GET_GUID_HOB_DATA (GuidHob);
   } else {
-    mPerformanceCounterFrequency = InternalCalculateTscFrequency ();
+    mAcpiTimerLibTscFrequency = InternalCalculateTscFrequency ();
   }
 

trunk/src/VBox/Devices/EFI/FirmwareNew/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtcEntry.c

@@ -123 +123 @@
   @param[in]    Context Event Context
 **/
+STATIC
 VOID
 EFIAPI
-LibRtcVirtualNotifyEvent (
+VirtualNotifyEvent (
   IN EFI_EVENT  Event,
   IN VOID       *Context
@@ -221 +222 @@
                     EVT_NOTIFY_SIGNAL,
                     TPL_NOTIFY,
-                    LibRtcVirtualNotifyEvent,
+                    VirtualNotifyEvent,
                     NULL,
                     &gEfiEventVirtualAddressChangeGuid,