Changeset 100267 in vbox for trunk/include

Timestamp:

Jun 23, 2023 2:57:53 PM (18 months ago)

Author:

vboxsync

Message:

Additions: Make the R0 physical heap configurable to allow for allocations >= 4GiB if supported by the VBox device (the MMIO request path is available), add support for the MMIO request path required for ARM, bugref:10457

Location:

trunk/include/VBox

Files:

• VBoxGuest.h (modified) (5 diffs)
• VBoxGuestLib.h (modified) (3 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -266 +266 @@
             /** The MMIO mapping.  NULL if no MMIO region. */
             struct VMMDevMemory volatile RT_FAR *pvVmmDevMapping;
+            /** The MMIO region for the request port, NULL if not available. */
+            uintptr_t volatile RT_FAR           *pMmioReq;
             /** The I/O port address. */
             RTIOPORT                        IoPort;
@@ -273 +275 @@
     } u;
 } VBGLIOCGETVMMDEVIOINFO, RT_FAR *PVBGLIOCGETVMMDEVIOINFO;
-AssertCompileSize(VBGLIOCGETVMMDEVIOINFO, 24 + (HC_ARCH_BITS == 64 ? 16 : 8));
+AssertCompileSize(VBGLIOCGETVMMDEVIOINFO, 24 + (HC_ARCH_BITS == 64 ? 24 : 12));
 /** @} */
 
@@ -388 +390 @@
     VBGLREQHDR      Hdr;
     /** The physical address of the following VMMDevHGCMCall structure. */
-    RTGCPHYS32      GCPhysReq;
+    RTGCPHYS64      GCPhysReq;
+    uint64_t        uTimestamp[2]; /** @todo Looks completely unused. */
     /** Set if interruptible. */
     bool            fInterruptible;
     /** Reserved. */
     uint8_t         abReserved0[3];
-    uint64_t        uTimestamp[2];
-    uint8_t         abReserved1[4];
     /* After this structure follows a VMMDevHGCMCall strcuture (44 bytes), then
        zero or more HGCMFunctionParameter structures (12 or 16 bytes), and finally
@@ -400 +401 @@
 } VBGLIOCIDCHGCMFASTCALL, RT_FAR *PVBGLIOCIDCHGCMFASTCALL;
 #pragma pack()
-AssertCompileSize(VBGLIOCIDCHGCMFASTCALL, /* 24 + 4 + 1 + 3 + 2*8 + 4 = 0x34 (52) = */ 0x34);
+AssertCompileSize(VBGLIOCIDCHGCMFASTCALL, /* 24 + 8 + 2*8 + 1 + 3 = 0x34 (52) = */ 0x34);
 
 /**
@@ -407 +408 @@
  *
  * @param   a_pHdr      The request header to initialize.
- * @param   a_HdrPhys   The 32-bit physical address corresponding to @a a_pHdr.
+ * @param   a_HdrPhys   The physical address corresponding to @a a_pHdr.
  * @param   a_pCall     Pointer to the VMMDevHGCMCall structure.
  * @param   a_idClient  The HGCM client ID.

trunk/include/VBox/VBoxGuestLib.h

@@ -121 +121 @@
  * @return VBox status code.
  */
-DECLR0VBGL(int)     VbglR0InitPrimary(RTIOPORT portVMMDev, VMMDevMemory *pVMMDevMemory, uint32_t *pfFeatures);
+DECLR0VBGL(int)     VbglR0InitPrimary(RTIOPORT portVMMDev, uintptr_t volatile *pMmioReq, VMMDevMemory *pVMMDevMemory, uint32_t *pfFeatures);
 
 /**
@@ -484 +484 @@
  *
  * @returns VBox status code.
- */
-DECLR0VBGL(int)     VbglR0PhysHeapInit(void);
+ * @param   fAlloc32BitAddr     Flag whether all allocations should be below 4GiB,
+ *                              so they fit into a 32-bit address.
+ */
+DECLR0VBGL(int)     VbglR0PhysHeapInit(bool fAlloc32BitAddr);
 
 /**
@@ -513 +515 @@
  *          isn't valid.
  */
-DECLR0VBGL(uint32_t) VbglR0PhysHeapGetPhysAddr(void *pv);
+DECLR0VBGL(RTCCPHYS) VbglR0PhysHeapGetPhysAddr(void *pv);
 
 # ifdef IN_TESTCASE