Changeset 102514 in vbox for trunk

Timestamp:

Dec 7, 2023 9:02:42 AM (14 months ago)

Author:

vboxsync

Message:

include/VBox/platforms/vbox-armv8.h: Allow setting a dedicated MMIO region which is below 4GiB in addition to the standard MMIO region which can be anywhere in the address space (will be required for PCI MEM32 BARs), bugref:10528

Location:

trunk

Files:

• include/VBox/platforms/vbox-armv8.h (modified) (1 diff)
• src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/Library/VBoxArmPlatformLib.h (modified) (1 diff)
• src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxArmPlatformLib/VBoxArmPlatformLib.c (modified) (1 diff)
• src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxVirtMemInfoLib/VBoxVirtMemInfoLib.c (modified) (3 diffs)

trunk/include/VBox/platforms/vbox-armv8.h

@@ -78 +78 @@
     /** Size of the MMIO region in bytes, 0 if not available. */
     uint64_t                    cbMmio;
+    /** Offset backwards to the start of the MMIO32 region from the start of this descriptor, 0 if not available. */
+    uint64_t                    u64OffBackMmio32;
+    /** Size of the MMIO32 region in bytes, 0 if not available. */
+    uint64_t                    cbMmio32;
     /** Padding to 64KiB. */
-    uint8_t                     abPadding[_64K - 4 * sizeof(uint32_t) - 10 * sizeof(uint64_t)];
+    uint8_t                     abPadding[_64K - 4 * sizeof(uint32_t) - 12 * sizeof(uint64_t)];
 } VBOXPLATFORMARMV8;
 AssertCompileSize(VBOXPLATFORMARMV8, _64K);

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/Library/VBoxArmPlatformLib.h

@@ -127 +127 @@
 UINTN EFIAPI VBoxArmPlatformMmioSizeGet(VOID);
 
+
+/**
+ * Returns the physical address of the start of the MMIO32 region.
+ *
+ * @returns Physical address of the MMIO32 region start.
+ */
+EFI_PHYSICAL_ADDRESS EFIAPI VBoxArmPlatformMmio32StartGetPhysAddr(VOID);
+
+
+/**
+ * Returns the size of the MMIO32 region.
+ *
+ * @returns Size of the MMIO32 region.
+ */
+UINTN EFIAPI VBoxArmPlatformMmio32SizeGet(VOID);
+
 #endif
 

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxArmPlatformLib/VBoxArmPlatformLib.c

@@ -148 +148 @@
     return pDesc->cbMmio;
 }
+
+
+EFI_PHYSICAL_ADDRESS EFIAPI VBoxArmPlatformMmio32StartGetPhysAddr(VOID)
+{
+    PCVBOXPLATFORMARMV8 pDesc = (PCVBOXPLATFORMARMV8)VBoxArmPlatformDescGet();
+    ASSERT(pDesc->u32Magic == VBOXPLATFORMARMV8_MAGIC);
+
+    if (!pDesc->cbMmio)
+        return 0;
+
+    return (EFI_PHYSICAL_ADDRESS)((UINTN)pDesc - pDesc->u64OffBackMmio32);
+}
+
+
+UINTN EFIAPI VBoxArmPlatformMmio32SizeGet(VOID)
+{
+    PCVBOXPLATFORMARMV8 pDesc = (PCVBOXPLATFORMARMV8)VBoxArmPlatformDescGet();
+    ASSERT(pDesc->u32Magic == VBOXPLATFORMARMV8_MAGIC);
+
+    return pDesc->cbMmio32;
+}

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxVirtMemInfoLib/VBoxVirtMemInfoLib.c

@@ -46 +46 @@
 
 // Number of Virtual Memory Map Descriptors
-#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS  6
+#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS  7
 
 /**
@@ -126 +126 @@
   VirtualMemoryTable[3].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK_RO;
 
-  // Map the VBox descriptor region readonnly.
+  // Map the VBox descriptor region readonly.
   VirtualMemoryTable[4].PhysicalBase = VBoxArmPlatformDescGetPhysAddr();
   VirtualMemoryTable[4].VirtualBase  = VirtualMemoryTable[4].PhysicalBase;
@@ -132 +132 @@
   VirtualMemoryTable[4].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK_RO;
 
+  // Map the MMIO32 region if it exists.
+  if (VBoxArmPlatformMmio32SizeGet() != 0)
+  {
+    VirtualMemoryTable[5].PhysicalBase = VBoxArmPlatformMmio32StartGetPhysAddr();
+    VirtualMemoryTable[5].VirtualBase  = VirtualMemoryTable[5].PhysicalBase;
+    VirtualMemoryTable[5].Length       = VBoxArmPlatformMmio32SizeGet();
+    VirtualMemoryTable[5].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;
+  }
+
   // End of Table
-  ZeroMem (&VirtualMemoryTable[5], sizeof (ARM_MEMORY_REGION_DESCRIPTOR));
+  ZeroMem (&VirtualMemoryTable[6], sizeof (ARM_MEMORY_REGION_DESCRIPTOR));
 
   for (UINTN i = 0; i < MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS; i++)