Changeset 101438 in vbox for trunk/src/VBox/Devices/EFI/Firmware/ArmPlatformPkg

Timestamp:

Oct 13, 2023 12:46:05 PM (17 months ago)

Author:

vboxsync

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

159497

Message:

Devices/EFI/Firmware&ArmPlatformPkg/PrePeiCore: Don't use the hardcoded temporary stack address but determine the start of the base RAM from the VBox Armv8 platform descriptor and use it for the initial stack now that the FDT is not located at the start of the RAM region anymore, bugref:10528

Location:

trunk/src/VBox/Devices/EFI/Firmware/ArmPlatformPkg/PrePeiCore

Files:

• AArch64/PrePeiCoreEntryPoint.S (modified) (2 diffs)
• MainUniCore.c (modified) (2 diffs)
• PrePeiCore.c (modified) (3 diffs)
• PrePeiCoreUniCore.inf (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S

@@ -39 +39 @@
   bl    ASM_PFX(ArmPlatformIsPrimaryCore)
 
+#ifndef VBOX
   // Get the top of the primary stacks (and the base of the secondary stacks)
   MOV64 (x1, FixedPcdGet64(PcdCPUCoresStackBase) + FixedPcdGet32(PcdCPUCorePrimaryStackSize))
+#else
+  //
+  // The VirtualBox platform has the following layout:
+  //
+  //    0        128MiB            RAM size + 128MiB                                                                            -64KiB    Max phys address
+  //    +----------+------------------------+-----------------------------+-------------+---------+----------+---------+-----------+------------+
+  //    |   UEFI   |                        |                             |             |         |          |  Misc   |  FDT/ACPI |    VBox    |
+  //    | firmware |        RAM ..... =>    |  Not assigned address space | <= PCI MMIO | PCI PIO | PCI ECAM |  MMIO   |   table   | Descriptor |
+  //    |  region  |                        |                             |             |         |          | region  |   region  |   region   |
+  //    +----------+------------------------+-----------------------------+-------------+---------+----------+---------+-----------+------------+
+  //
+  // In order to have as few as hardcoded addresses as possible in the firmware
+  // VirtualBox installs a descriptor at the end of the physical address space
+  // where all the other information is stored.
+  //
+  // First the start of the region is determined by reading the size of the
+  // physical address space. From there the memory and stack is set up and
+  // the C entry point is called.
+  //
+  // Note: Only the VBox descriptor and UEFI firmware region are at a fixed location.
+  //       Everything else can float around freely in theory to give us the most flexibility.
+  //
+
+  // Save the result from ArmPlatformIsPrimaryCore().
+  mov x6, x0
+
+  // Get the number of physical address bits
+  bl ASM_PFX(ArmGetPhysicalAddressBits)
+
+  //
+  // Determine the start of the VBox descriptor region.
+  //
+  mov x1, #1
+  lsl x1, x1, x0      // Determine first invalid address
+  sub x1, x1, #65536  // Get at start of VBox descriptor region.
+
+  //
+  // Get at the ram base and use the beginning as our temporary stack.
+  //
+  ldr x1, [x1, #16]
+
+  // Get the top of the primary stacks (and the base of the secondary stacks)
+  add x1, x1, FixedPcdGet32(PcdCPUCorePrimaryStackSize)
+
+  // Restore the result from ArmPlatformIsPrimaryCore().
+  mov x0, x6
+#endif
 
   // x0 is equal to 1 if I am the primary core
@@ -82 +130 @@
 _SetupPrimaryCoreStack:
   mov   sp, x1
+#ifndef VBOX
   MOV64 (x8, FixedPcdGet64 (PcdCPUCoresStackBase))
+#else
+  sub   x8, x1, FixedPcdGet32(PcdCPUCorePrimaryStackSize)
+#endif
   MOV64 (x9, FixedPcdGet32 (PcdInitValueInTempStack) |\
              FixedPcdGet32 (PcdInitValueInTempStack) << 32)

trunk/src/VBox/Devices/EFI/Firmware/ArmPlatformPkg/PrePeiCore/MainUniCore.c

@@ -8 +8 @@
 
 #include "PrePeiCore.h"
+
+#ifdef VBOX
+# include <Library/VBoxArmPlatformLib.h>
+#endif
 
 VOID
@@ -35 +39 @@
   // the base of the primary core stack
   PpiListSize      = ALIGN_VALUE (PpiListSize, CPU_STACK_ALIGNMENT);
+#ifndef VBOX
   TemporaryRamBase = (UINTN)PcdGet64 (PcdCPUCoresStackBase) + PpiListSize;
+#else
+  TemporaryRamBase = (UINTN)VBoxArmPlatformRamBaseStartGetPhysAddr() + PpiListSize;
+#endif
   TemporaryRamSize = (UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize) - PpiListSize;
 

trunk/src/VBox/Devices/EFI/Firmware/ArmPlatformPkg/PrePeiCore/PrePeiCore.c

@@ -14 +14 @@
 #include <Library/PrintLib.h>
 #include <Library/SerialPortLib.h>
+
+#ifdef VBOX
+# include <Library/VBoxArmPlatformLib.h>
+#endif
 
 #include "PrePeiCore.h"
@@ -43 +47 @@
 
   // Copy the Common and Platform PPis in Temporary Memory
+#ifndef VBOX
   ListBase = PcdGet64 (PcdCPUCoresStackBase);
+#else
+  ListBase = (UINTN)VBoxArmPlatformRamBaseStartGetPhysAddr();
+#endif
   CopyMem ((VOID *)ListBase, gCommonPpiTable, sizeof (gCommonPpiTable));
   CopyMem ((VOID *)(ListBase + sizeof (gCommonPpiTable)), PlatformPpiList, PlatformPpiListSize);
@@ -94 +102 @@
     ArmEnableInstructionCache ();
 
+#ifndef VBOX
     InvalidateDataCacheRange (
       (VOID *)(UINTN)PcdGet64 (PcdCPUCoresStackBase),
       PcdGet32 (PcdCPUCorePrimaryStackSize)
       );
+#else
+    InvalidateDataCacheRange (
+      (VOID *)(UINTN)VBoxArmPlatformRamBaseStartGetPhysAddr(),
+      PcdGet32 (PcdCPUCorePrimaryStackSize)
+      );
+#endif
   }
 

trunk/src/VBox/Devices/EFI/Firmware/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf

@@ -38 +38 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
+  VBoxPkg/VBoxPkg.dec               # VBox: Added
 
 [LibraryClasses]
@@ -49 +50 @@
   PrintLib
   SerialPortLib
+  VBoxArmPlatformLib                # VBox: Added
 
 [Ppis]