Changeset 102513 in vbox

Timestamp:

Dec 7, 2023 9:00:42 AM (12 months ago)

Author:

vboxsync

Message:

Devices/EFI/Firmware: Allow the PL031 RTC device to be accessible anywhere in the 64-bit address space, bugref:10528

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• ArmPlatformPkg/ArmPlatformPkg.dec (modified) (1 diff)
• ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c (modified) (1 diff)
• ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware/ArmPlatformPkg/ArmPlatformPkg.dec

@@ -119 +119 @@
 [PcdsFixedAtBuild.common,PcdsDynamic.common]
   ## PL031 RealTimeClock
-  gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024
+  gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT64|0x00000024 # VBox: Changed from UINT32 to UINT64
   gArmPlatformTokenSpaceGuid.PcdPL031RtcPpmAccuracy|300000000|UINT32|0x00000022
 

trunk/src/VBox/Devices/EFI/Firmware/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c

@@ -313 +313 @@
 
   // Initialize RTC Base Address
+#ifdef VBOX
+  mPL031RtcBase = PcdGet64 (PcdPL031RtcBase);
+#else
   mPL031RtcBase = PcdGet32 (PcdPL031RtcBase);
+#endif
 
   // Declare the controller as EFI_MEMORY_RUNTIME

trunk/src/VBox/Devices/EFI/Firmware/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c

@@ -67 +67 @@
 
   RegBase = SwapBytes64 (Reg[0]);
+#ifdef VBOX
+  PcdStatus = PcdSet64S (PcdPL031RtcBase, RegBase);
+#else
   ASSERT (RegBase < MAX_UINT32);
 
   PcdStatus = PcdSet32S (PcdPL031RtcBase, (UINT32)RegBase);
+#endif
   ASSERT_RETURN_ERROR (PcdStatus);