Changeset 81197 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 9, 2019 8:36:46 PM (5 years ago)

Author:

vboxsync

Message:

IOM: More MMIO code. bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (1 diff)
• VMMR0/IOMR0.cpp (modified) (2 diffs)
• VMMR0/IOMR0IoPort.cpp (modified) (1 diff)
• VMMR0/IOMR0Mmio.cpp (copied) (copied from trunk/src/VBox/VMM/VMMR0/IOMR0IoPort.cpp ) (19 diffs)
• VMMR0/PDMR0Device.cpp (modified) (1 diff)
• VMMR0/VMMR0.cpp (modified) (2 diffs)
• VMMR3/IOMR3Mmio.cpp (modified) (1 diff)
• include/IOMInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -484 +484 @@
         VMMR0/IOMR0.cpp \
         VMMR0/IOMR0IoPort.cpp \
+        VMMR0/IOMR0Mmio.cpp \
         VMMR0/PDMR0Device.cpp \
         VMMR0/PDMR0Driver.cpp \

trunk/src/VBox/VMM/VMMR0/IOMR0.cpp

@@ -43 +43 @@
 
     iomR0IoPortInitPerVMData(pGVM);
+    iomR0MmioInitPerVMData(pGVM);
 }
 
@@ -52 +53 @@
 {
     iomR0IoPortCleanupVM(pGVM);
+    iomR0MmioCleanupVM(pGVM);
 }
 

trunk/src/VBox/VMM/VMMR0/IOMR0IoPort.cpp

@@ -98 +98 @@
     AssertReturn(pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].pDevIns == pDevIns->pDevInsForR3, VERR_IOM_INVALID_IOPORT_HANDLE);
     AssertReturn(pGVM->iomr0.s.paIoPortRegs[hIoPorts].pDevIns == NULL, VERR_WRONG_ORDER);
+    Assert(pGVM->iomr0.s.paIoPortRegs[hIoPorts].idxSelf == hIoPorts);
 
     AssertReturn(pfnOut || pfnIn || pfnOutStr || pfnInStr, VERR_INVALID_PARAMETER);

trunk/src/VBox/VMM/VMMR0/IOMR0Mmio.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IOM - Host Context Ring 0, I/O ports.
+ * IOM - Host Context Ring 0, MMIO.
  */
 
@@ -36 +36 @@
 
 /**
- * Initializes the I/O port related members.
+ * Initializes the MMIO related members.
  *
  * @param   pGVM    Pointer to the global VM structure.
  */
-void iomR0IoPortInitPerVMData(PGVM pGVM)
-{
-    pGVM->iomr0.s.hIoPortMapObj      = NIL_RTR0MEMOBJ;
-    pGVM->iomr0.s.hIoPortMemObj      = NIL_RTR0MEMOBJ;
+void iomR0MmioInitPerVMData(PGVM pGVM)
+{
+    pGVM->iomr0.s.hMmioMapObj      = NIL_RTR0MEMOBJ;
+    pGVM->iomr0.s.hMmioMemObj      = NIL_RTR0MEMOBJ;
 #ifdef VBOX_WITH_STATISTICS
-    pGVM->iomr0.s.hIoPortStatsMapObj = NIL_RTR0MEMOBJ;
-    pGVM->iomr0.s.hIoPortStatsMemObj = NIL_RTR0MEMOBJ;
+    pGVM->iomr0.s.hMmioStatsMapObj = NIL_RTR0MEMOBJ;
+    pGVM->iomr0.s.hMmioStatsMemObj = NIL_RTR0MEMOBJ;
 #endif
 }
@@ -52 +52 @@
 
 /**
- * Cleans up I/O port related resources.
- */
-void iomR0IoPortCleanupVM(PGVM pGVM)
-{
-    RTR0MemObjFree(pGVM->iomr0.s.hIoPortMapObj, true /*fFreeMappings*/);
-    pGVM->iomr0.s.hIoPortMapObj      = NIL_RTR0MEMOBJ;
-    RTR0MemObjFree(pGVM->iomr0.s.hIoPortMemObj, true /*fFreeMappings*/);
-    pGVM->iomr0.s.hIoPortMemObj      = NIL_RTR0MEMOBJ;
+ * Cleans up MMIO related resources.
+ */
+void iomR0MmioCleanupVM(PGVM pGVM)
+{
+    RTR0MemObjFree(pGVM->iomr0.s.hMmioMapObj, true /*fFreeMappings*/);
+    pGVM->iomr0.s.hMmioMapObj      = NIL_RTR0MEMOBJ;
+    RTR0MemObjFree(pGVM->iomr0.s.hMmioMemObj, true /*fFreeMappings*/);
+    pGVM->iomr0.s.hMmioMemObj      = NIL_RTR0MEMOBJ;
 #ifdef VBOX_WITH_STATISTICS
-    RTR0MemObjFree(pGVM->iomr0.s.hIoPortStatsMapObj, true /*fFreeMappings*/);
-    pGVM->iomr0.s.hIoPortStatsMapObj = NIL_RTR0MEMOBJ;
-    RTR0MemObjFree(pGVM->iomr0.s.hIoPortStatsMemObj, true /*fFreeMappings*/);
-    pGVM->iomr0.s.hIoPortStatsMemObj = NIL_RTR0MEMOBJ;
+    RTR0MemObjFree(pGVM->iomr0.s.hMmioStatsMapObj, true /*fFreeMappings*/);
+    pGVM->iomr0.s.hMmioStatsMapObj = NIL_RTR0MEMOBJ;
+    RTR0MemObjFree(pGVM->iomr0.s.hMmioStatsMemObj, true /*fFreeMappings*/);
+    pGVM->iomr0.s.hMmioStatsMemObj = NIL_RTR0MEMOBJ;
 #endif
 }
@@ -70 +70 @@
 
 /**
- * Implements PDMDEVHLPR0::pfnIoPortSetUpContext.
+ * Implements PDMDEVHLPR0::pfnMmioSetUpContext.
  *
  * @param   pGVM            The global (ring-0) VM structure.
  * @param   pDevIns         The device instance.
- * @param   hIoPorts        The I/O port handle (already registered in ring-3).
- * @param   pfnOut          The OUT handler callback, optional.
- * @param   pfnIn           The IN handler callback, optional.
- * @param   pfnOutStr       The REP OUTS handler callback, optional.
- * @param   pfnInStr        The REP INS handler callback, optional.
+ * @param   hRegion         The MMIO region handle (already registered in
+ *                          ring-3).
+ * @param   pfnWrite        The write handler callback, optional.
+ * @param   pfnRead         The read handler callback, optional.
+ * @param   pfnFill         The fill handler callback, optional.
  * @param   pvUser          User argument for the callbacks.
  * @thread  EMT(0)
  * @note    Only callable at VM creation time.
  */
-VMMR0_INT_DECL(int)  IOMR0IoPortSetUpContext(PGVM pGVM, PPDMDEVINS pDevIns, IOMIOPORTHANDLE hIoPorts,
-                                             PFNIOMIOPORTNEWOUT pfnOut,  PFNIOMIOPORTNEWIN pfnIn,
-                                             PFNIOMIOPORTNEWOUTSTRING pfnOutStr, PFNIOMIOPORTNEWINSTRING pfnInStr, void *pvUser)
+VMMR0_INT_DECL(int)  IOMR0MmioSetUpContext(PGVM pGVM, PPDMDEVINS pDevIns, IOMMMIOHANDLE hRegion, PFNIOMMMIONEWWRITE pfnWrite,
+                                           PFNIOMMMIONEWREAD pfnRead, PFNIOMMMIONEWFILL pfnFill, void *pvUser)
 {
     /*
@@ -92 +91 @@
     VM_ASSERT_EMT0_RETURN(pGVM, VERR_VM_THREAD_NOT_EMT);
     VM_ASSERT_STATE_RETURN(pGVM, VMSTATE_CREATING, VERR_VM_INVALID_VM_STATE);
-    AssertReturn(hIoPorts < pGVM->iomr0.s.cIoPortAlloc, VERR_IOM_INVALID_IOPORT_HANDLE);
-    AssertReturn(hIoPorts < pGVM->iom.s.cIoPortRegs, VERR_IOM_INVALID_IOPORT_HANDLE);
+    AssertReturn(hRegion < pGVM->iomr0.s.cMmioAlloc, VERR_IOM_INVALID_MMIO_HANDLE);
+    AssertReturn(hRegion < pGVM->iom.s.cMmioRegs, VERR_IOM_INVALID_MMIO_HANDLE);
     AssertPtrReturn(pDevIns, VERR_INVALID_HANDLE);
     AssertReturn(pDevIns->pDevInsForR3 != NIL_RTR3PTR && !(pDevIns->pDevInsForR3 & PAGE_OFFSET_MASK), VERR_INVALID_PARAMETER);
-    AssertReturn(pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].pDevIns == pDevIns->pDevInsForR3, VERR_IOM_INVALID_IOPORT_HANDLE);
-    AssertReturn(pGVM->iomr0.s.paIoPortRegs[hIoPorts].pDevIns == NULL, VERR_WRONG_ORDER);
-
-    AssertReturn(pfnOut || pfnIn || pfnOutStr || pfnInStr, VERR_INVALID_PARAMETER);
-    AssertPtrNullReturn(pfnOut, VERR_INVALID_POINTER);
-    AssertPtrNullReturn(pfnIn, VERR_INVALID_POINTER);
-    AssertPtrNullReturn(pfnOutStr, VERR_INVALID_POINTER);
-    AssertPtrNullReturn(pfnInStr, VERR_INVALID_POINTER);
-
-    uint16_t const fFlags = pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].fFlags;
-    RTIOPORT const cPorts = pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].cPorts;
-    AssertMsgReturn(cPorts > 0 && cPorts <= _8K, ("cPorts=%s\n", cPorts), VERR_IOM_INVALID_IOPORT_HANDLE);
+    AssertReturn(pGVM->iomr0.s.paMmioRing3Regs[hRegion].pDevIns == pDevIns->pDevInsForR3, VERR_IOM_INVALID_MMIO_HANDLE);
+    AssertReturn(pGVM->iomr0.s.paMmioRegs[hRegion].pDevIns == NULL, VERR_WRONG_ORDER);
+    Assert(pGVM->iomr0.s.paMmioRegs[hRegion].idxSelf == hRegion);
+
+    AssertReturn(pfnWrite || pfnRead || pfnFill, VERR_INVALID_PARAMETER);
+    AssertPtrNullReturn(pfnWrite, VERR_INVALID_POINTER);
+    AssertPtrNullReturn(pfnRead, VERR_INVALID_POINTER);
+    AssertPtrNullReturn(pfnFill, VERR_INVALID_POINTER);
+
+    uint32_t const fFlags   = pGVM->iomr0.s.paMmioRing3Regs[hRegion].fFlags;
+    RTGCPHYS const cbRegion = pGVM->iomr0.s.paMmioRing3Regs[hRegion].cbRegion;
+    AssertMsgReturn(cbRegion > 0 && cbRegion <= _1T, ("cbRegion=%#RGp\n", cbRegion), VERR_IOM_INVALID_MMIO_HANDLE);
 
     /*
      * Do the job.
      */
-    pGVM->iomr0.s.paIoPortRegs[hIoPorts].pvUser             = pvUser;
-    pGVM->iomr0.s.paIoPortRegs[hIoPorts].pDevIns            = pDevIns;
-    pGVM->iomr0.s.paIoPortRegs[hIoPorts].pfnOutCallback     = pfnOut;
-    pGVM->iomr0.s.paIoPortRegs[hIoPorts].pfnInCallback      = pfnIn;
-    pGVM->iomr0.s.paIoPortRegs[hIoPorts].pfnOutStrCallback  = pfnOutStr;
-    pGVM->iomr0.s.paIoPortRegs[hIoPorts].pfnInStrCallback   = pfnInStr;
-    pGVM->iomr0.s.paIoPortRegs[hIoPorts].cPorts             = cPorts;
-    pGVM->iomr0.s.paIoPortRegs[hIoPorts].fFlags             = fFlags;
+    pGVM->iomr0.s.paMmioRegs[hRegion].cbRegion          = cbRegion;
+    pGVM->iomr0.s.paMmioRegs[hRegion].pvUser            = pvUser;
+    pGVM->iomr0.s.paMmioRegs[hRegion].pDevIns           = pDevIns;
+    pGVM->iomr0.s.paMmioRegs[hRegion].pfnWriteCallback  = pfnWrite;
+    pGVM->iomr0.s.paMmioRegs[hRegion].pfnReadCallback   = pfnRead;
+    pGVM->iomr0.s.paMmioRegs[hRegion].pfnFillCallback   = pfnFill;
+    pGVM->iomr0.s.paMmioRegs[hRegion].fFlags            = fFlags;
 #ifdef VBOX_WITH_STATISTICS
-    uint16_t const idxStats = pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].idxStats;
-    pGVM->iomr0.s.paIoPortRegs[hIoPorts].idxStats           = (uint32_t)idxStats + cPorts <= pGVM->iomr0.s.cIoPortStatsAllocation
-                                                            ? idxStats : UINT16_MAX;
+    uint16_t const idxStats = pGVM->iomr0.s.paMmioRing3Regs[hRegion].idxStats;
+    pGVM->iomr0.s.paMmioRegs[hRegion].idxStats          = (uint32_t)idxStats < pGVM->iomr0.s.cMmioStatsAllocation
+                                                        ? idxStats : UINT16_MAX;
 #else
-    pGVM->iomr0.s.paIoPortRegs[hIoPorts].idxStats           = UINT16_MAX;
+    pGVM->iomr0.s.paMmioRegs[hRegion].idxStats          = UINT16_MAX;
 #endif
 
-    pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].fRing0 = true;
+    pGVM->iomr0.s.paMmioRing3Regs[hRegion].fRing0 = true;
 
     return VINF_SUCCESS;
@@ -135 +133 @@
 
 /**
- * Grows the I/O port registration (all contexts) and lookup tables.
+ * Grows the MMIO registration (all contexts) and lookup tables.
  *
  * @returns VBox status code.
@@ -143 +141 @@
  * @note    Only callable at VM creation time.
  */
-VMMR0_INT_DECL(int) IOMR0IoPortGrowRegistrationTables(PGVM pGVM, uint64_t cReqMinEntries)
+VMMR0_INT_DECL(int) IOMR0MmioGrowRegistrationTables(PGVM pGVM, uint64_t cReqMinEntries)
 {
     /*
@@ -150 +148 @@
     VM_ASSERT_EMT0_RETURN(pGVM, VERR_VM_THREAD_NOT_EMT);
     VM_ASSERT_STATE_RETURN(pGVM, VMSTATE_CREATING, VERR_VM_INVALID_VM_STATE);
-    AssertReturn(cReqMinEntries <= _4K, VERR_IOM_TOO_MANY_IOPORT_REGISTRATIONS);
+    AssertReturn(cReqMinEntries <= _4K, VERR_IOM_TOO_MANY_MMIO_REGISTRATIONS);
     uint32_t cNewEntries = (uint32_t)cReqMinEntries;
-    AssertReturn(cNewEntries >= pGVM->iom.s.cIoPortAlloc, VERR_IOM_IOPORT_IPE_1);
-    uint32_t const cOldEntries = pGVM->iomr0.s.cIoPortAlloc;
+    AssertReturn(cNewEntries >= pGVM->iom.s.cMmioAlloc, VERR_IOM_MMIO_IPE_1);
+    uint32_t const cOldEntries = pGVM->iomr0.s.cMmioAlloc;
     ASMCompilerBarrier();
-    AssertReturn(cNewEntries >= cOldEntries, VERR_IOM_IOPORT_IPE_2);
-    AssertReturn(pGVM->iom.s.cIoPortRegs >= pGVM->iomr0.s.cIoPortMax, VERR_IOM_IOPORT_IPE_3);
+    AssertReturn(cNewEntries >= cOldEntries, VERR_IOM_MMIO_IPE_2);
+    AssertReturn(pGVM->iom.s.cMmioRegs >= pGVM->iomr0.s.cMmioMax, VERR_IOM_MMIO_IPE_3);
 
     /*
@@ -162 +160 @@
      * ring-3, lookup) and does a partial mapping of the result to ring-3.
      */
-    uint32_t const cbRing0  = RT_ALIGN_32(cNewEntries * sizeof(IOMIOPORTENTRYR0),     PAGE_SIZE);
-    uint32_t const cbRing3  = RT_ALIGN_32(cNewEntries * sizeof(IOMIOPORTENTRYR3),     PAGE_SIZE);
-    uint32_t const cbShared = RT_ALIGN_32(cNewEntries * sizeof(IOMIOPORTLOOKUPENTRY), PAGE_SIZE);
+    uint32_t const cbRing0  = RT_ALIGN_32(cNewEntries * sizeof(IOMMMIOENTRYR0),     PAGE_SIZE);
+    uint32_t const cbRing3  = RT_ALIGN_32(cNewEntries * sizeof(IOMMMIOENTRYR3),     PAGE_SIZE);
+    uint32_t const cbShared = RT_ALIGN_32(cNewEntries * sizeof(IOMMMIOLOOKUPENTRY), PAGE_SIZE);
     uint32_t const cbNew    = cbRing0 + cbRing3 + cbShared;
 
     /* Use the rounded up space as best we can. */
-    cNewEntries = RT_MIN(RT_MIN(cbRing0 / sizeof(IOMIOPORTENTRYR0), cbRing3 / sizeof(IOMIOPORTENTRYR3)),
-                         cbShared / sizeof(IOMIOPORTLOOKUPENTRY));
+    cNewEntries = RT_MIN(RT_MIN(cbRing0 / sizeof(IOMMMIOENTRYR0), cbRing3 / sizeof(IOMMMIOENTRYR3)),
+                         cbShared / sizeof(IOMMMIOLOOKUPENTRY));
 
     RTR0MEMOBJ hMemObj;
@@ -185 +183 @@
         if (RT_SUCCESS(rc))
         {
-            PIOMIOPORTENTRYR0     const paRing0    = (PIOMIOPORTENTRYR0)RTR0MemObjAddress(hMemObj);
-            PIOMIOPORTENTRYR3     const paRing3    = (PIOMIOPORTENTRYR3)((uintptr_t)paRing0 + cbRing0);
-            PIOMIOPORTLOOKUPENTRY const paLookup   = (PIOMIOPORTLOOKUPENTRY)((uintptr_t)paRing3 + cbRing3);
+            PIOMMMIOENTRYR0       const paRing0    = (PIOMMMIOENTRYR0)RTR0MemObjAddress(hMemObj);
+            PIOMMMIOENTRYR3       const paRing3    = (PIOMMMIOENTRYR3)((uintptr_t)paRing0 + cbRing0);
+            PIOMMMIOLOOKUPENTRY   const paLookup   = (PIOMMMIOLOOKUPENTRY)((uintptr_t)paRing3 + cbRing3);
             RTR3UINTPTR           const uAddrRing3 = RTR0MemObjAddressR3(hMapObj);
 
@@ -193 +191 @@
              * Copy over the old info and initialize the idxSelf and idxStats members.
              */
-            if (pGVM->iomr0.s.paIoPortRegs != NULL)
+            if (pGVM->iomr0.s.paMmioRegs != NULL)
             {
-                memcpy(paRing0,  pGVM->iomr0.s.paIoPortRegs,      sizeof(paRing0[0])  * cOldEntries);
-                memcpy(paRing3,  pGVM->iomr0.s.paIoPortRing3Regs, sizeof(paRing3[0])  * cOldEntries);
-                memcpy(paLookup, pGVM->iomr0.s.paIoPortLookup,    sizeof(paLookup[0]) * cOldEntries);
+                memcpy(paRing0,  pGVM->iomr0.s.paMmioRegs,      sizeof(paRing0[0])  * cOldEntries);
+                memcpy(paRing3,  pGVM->iomr0.s.paMmioRing3Regs, sizeof(paRing3[0])  * cOldEntries);
+                memcpy(paLookup, pGVM->iomr0.s.paMmioLookup,    sizeof(paLookup[0]) * cOldEntries);
             }
 
@@ -212 +210 @@
              * Switch the memory handles.
              */
-            RTR0MEMOBJ hTmp = pGVM->iomr0.s.hIoPortMapObj;
-            pGVM->iomr0.s.hIoPortMapObj = hMapObj;
+            RTR0MEMOBJ hTmp = pGVM->iomr0.s.hMmioMapObj;
+            pGVM->iomr0.s.hMmioMapObj = hMapObj;
             hMapObj = hTmp;
 
-            hTmp = pGVM->iomr0.s.hIoPortMemObj;
-            pGVM->iomr0.s.hIoPortMemObj = hMemObj;
+            hTmp = pGVM->iomr0.s.hMmioMemObj;
+            pGVM->iomr0.s.hMmioMemObj = hMemObj;
             hMemObj = hTmp;
 
@@ -223 +221 @@
              * Update the variables.
              */
-            pGVM->iomr0.s.paIoPortRegs      = paRing0;
-            pGVM->iomr0.s.paIoPortRing3Regs = paRing3;
-            pGVM->iomr0.s.paIoPortLookup    = paLookup;
-            pGVM->iom.s.paIoPortRegs        = uAddrRing3;
-            pGVM->iom.s.paIoPortLookup      = uAddrRing3 + cbRing3;
-            pGVM->iom.s.cIoPortAlloc        = cNewEntries;
-            pGVM->iomr0.s.cIoPortAlloc      = cNewEntries;
+            pGVM->iomr0.s.paMmioRegs      = paRing0;
+            pGVM->iomr0.s.paMmioRing3Regs = paRing3;
+            pGVM->iomr0.s.paMmioLookup    = paLookup;
+            pGVM->iom.s.paMmioRegs        = uAddrRing3;
+            pGVM->iom.s.paMmioLookup      = uAddrRing3 + cbRing3;
+            pGVM->iom.s.cMmioAlloc        = cNewEntries;
+            pGVM->iomr0.s.cMmioAlloc      = cNewEntries;
 
             /*
@@ -244 +242 @@
 
 /**
- * Grows the I/O port statistics table.
+ * Grows the MMIO statistics table.
  *
  * @returns VBox status code.
@@ -252 +250 @@
  * @note    Only callable at VM creation time.
  */
-VMMR0_INT_DECL(int) IOMR0IoPortGrowStatisticsTable(PGVM pGVM, uint64_t cReqMinEntries)
+VMMR0_INT_DECL(int) IOMR0MmioGrowStatisticsTable(PGVM pGVM, uint64_t cReqMinEntries)
 {
     /*
@@ -259 +257 @@
     VM_ASSERT_EMT0_RETURN(pGVM, VERR_VM_THREAD_NOT_EMT);
     VM_ASSERT_STATE_RETURN(pGVM, VMSTATE_CREATING, VERR_VM_INVALID_VM_STATE);
-    AssertReturn(cReqMinEntries <= _64K, VERR_IOM_TOO_MANY_IOPORT_REGISTRATIONS);
+    AssertReturn(cReqMinEntries <= _64K, VERR_IOM_TOO_MANY_MMIO_REGISTRATIONS);
     uint32_t cNewEntries = (uint32_t)cReqMinEntries;
 #ifdef VBOX_WITH_STATISTICS
-    uint32_t const cOldEntries = pGVM->iomr0.s.cIoPortStatsAllocation;
+    uint32_t const cOldEntries = pGVM->iomr0.s.cMmioStatsAllocation;
     ASMCompilerBarrier();
 #else
     uint32_t const cOldEntries = 0;
 #endif
-    AssertReturn(cNewEntries > cOldEntries, VERR_IOM_IOPORT_IPE_1);
-    AssertReturn(pGVM->iom.s.cIoPortStatsAllocation == cOldEntries, VERR_IOM_IOPORT_IPE_1);
-    AssertReturn(pGVM->iom.s.cIoPortStats <= cOldEntries, VERR_IOM_IOPORT_IPE_2);
+    AssertReturn(cNewEntries > cOldEntries, VERR_IOM_MMIO_IPE_1);
+    AssertReturn(pGVM->iom.s.cMmioStatsAllocation == cOldEntries, VERR_IOM_MMIO_IPE_1);
+    AssertReturn(pGVM->iom.s.cMmioStats <= cOldEntries, VERR_IOM_MMIO_IPE_2);
 
     /*
@@ -277 +275 @@
     AssertFailedReturn(VERR_NOT_SUPPORTED);
 #else
-    uint32_t const cbNew = RT_ALIGN_32(cNewEntries * sizeof(IOMIOPORTSTATSENTRY), PAGE_SIZE);
-    cNewEntries = cbNew / sizeof(IOMIOPORTSTATSENTRY);
+    uint32_t const cbNew = RT_ALIGN_32(cNewEntries * sizeof(IOMMMIOSTATSENTRY), PAGE_SIZE);
+    cNewEntries = cbNew / sizeof(IOMMMIOSTATSENTRY);
 
     RTR0MEMOBJ hMemObj;
@@ -290 +288 @@
         if (RT_SUCCESS(rc))
         {
-            PIOMIOPORTSTATSENTRY pIoPortStats = (PIOMIOPORTSTATSENTRY)RTR0MemObjAddress(hMemObj);
+            PIOMMMIOSTATSENTRY pMmioStats = (PIOMMMIOSTATSENTRY)RTR0MemObjAddress(hMemObj);
 
             /*
              * Anything to copy over and free up?
              */
-            if (pGVM->iomr0.s.paIoPortStats)
-                memcpy(pIoPortStats, pGVM->iomr0.s.paIoPortStats, cOldEntries * sizeof(IOMIOPORTSTATSENTRY));
+            if (pGVM->iomr0.s.paMmioStats)
+                memcpy(pMmioStats, pGVM->iomr0.s.paMmioStats, cOldEntries * sizeof(IOMMMIOSTATSENTRY));
 
             /*
              * Switch the memory handles.
              */
-            RTR0MEMOBJ hTmp = pGVM->iomr0.s.hIoPortStatsMapObj;
-            pGVM->iomr0.s.hIoPortStatsMapObj = hMapObj;
+            RTR0MEMOBJ hTmp = pGVM->iomr0.s.hMmioStatsMapObj;
+            pGVM->iomr0.s.hMmioStatsMapObj = hMapObj;
             hMapObj = hTmp;
 
-            hTmp = pGVM->iomr0.s.hIoPortStatsMemObj;
-            pGVM->iomr0.s.hIoPortStatsMemObj = hMemObj;
+            hTmp = pGVM->iomr0.s.hMmioStatsMemObj;
+            pGVM->iomr0.s.hMmioStatsMemObj = hMemObj;
             hMemObj = hTmp;
 
@@ -312 +310 @@
              * Update the variables.
              */
-            pGVM->iomr0.s.paIoPortStats          = pIoPortStats;
-            pGVM->iom.s.paIoPortStats            = RTR0MemObjAddressR3(pGVM->iomr0.s.hIoPortStatsMapObj);
-            pGVM->iom.s.cIoPortStatsAllocation   = cNewEntries;
-            pGVM->iomr0.s.cIoPortStatsAllocation = cNewEntries;
+            pGVM->iomr0.s.paMmioStats          = pMmioStats;
+            pGVM->iom.s.paMmioStats            = RTR0MemObjAddressR3(pGVM->iomr0.s.hMmioStatsMapObj);
+            pGVM->iom.s.cMmioStatsAllocation   = cNewEntries;
+            pGVM->iomr0.s.cMmioStatsAllocation = cNewEntries;
 
             /*

trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

@@ -214 +214 @@
                                                         PFNIOMMMIONEWREAD pfnRead, PFNIOMMMIONEWFILL pfnFill, void *pvUser)
 {
-    RT_NOREF(pDevIns, hRegion, pfnWrite, pfnRead, pfnFill, pvUser);
-    return VERR_NOT_IMPLEMENTED;
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR0DevHlp_MmioSetUpContextEx: caller='%s'/%d: hRegion=%#x pfnWrite=%p pfnRead=%p pfnFill=%p pvUser=%p\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, hRegion, pfnWrite, pfnRead, pfnFill, pvUser));
+    PGVM pGVM = pDevIns->Internal.s.pGVM;
+    VM_ASSERT_EMT0_RETURN(pGVM, VERR_VM_THREAD_NOT_EMT);
+    VM_ASSERT_STATE_RETURN(pGVM, VMSTATE_CREATING, VERR_VM_INVALID_VM_STATE);
+
+    int rc = IOMR0MmioSetUpContext(pGVM, pDevIns, hRegion, pfnWrite, pfnRead, pfnFill, pvUser);
+
+    LogFlow(("pdmR0DevHlp_MmioSetUpContextEx: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
+    return rc;
 }
 

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -2203 +2203 @@
             if (pReqHdr || idCpu != 0)
                 return VERR_INVALID_PARAMETER;
-            rc = VERR_NOT_SUPPORTED; //rc = IOMR0MmioGrowRegistrationTables(pGVM, u64Arg);
+            rc = IOMR0MmioGrowRegistrationTables(pGVM, u64Arg);
             VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;
@@ -2212 +2212 @@
             if (pReqHdr || idCpu != 0)
                 return VERR_INVALID_PARAMETER;
-            rc = VERR_NOT_SUPPORTED; //rc = IOMR0MmioGrowStatisticsTable(pGVM, u64Arg);
+            rc = IOMR0MmioGrowStatisticsTable(pGVM, u64Arg);
             VMM_CHECK_SMAP_CHECK2(pGVM, RT_NOTHING);
             break;

trunk/src/VBox/VMM/VMMR3/IOMR3Mmio.cpp

@@ -186 +186 @@
 
     RTGCPHYS const cbRegion = pRegEntry->cbRegion;
-    AssertMsgReturn(cbRegion > 0 && cbRegion <= _1P, ("cbRegion=%RGp\n", cbRegion), VERR_IOM_MMIO_IPE_1);
+    AssertMsgReturn(cbRegion > 0 && cbRegion <= _1T, ("cbRegion=%RGp\n", cbRegion), VERR_IOM_MMIO_IPE_1);
     AssertReturn(GCPhys + cbRegion <= GCPhys, VERR_OUT_OF_RANGE);
     RTGCPHYS const GCPhysLast = GCPhys + cbRegion - 1;

trunk/src/VBox/VMM/include/IOMInternal.h

@@ -808 +808 @@
     /** MMIO registration table for ring-0.
      * There is a parallel table for ring-3, paMmioRing3Regs. */
-    R0PTRTYPE(PIOMIOPORTENTRYR0)    paMmioRegs;
+    R0PTRTYPE(PIOMMMIOENTRYR0)      paMmioRegs;
     /** MMIO lookup table. */
-    R0PTRTYPE(PIOMIOPORTLOOKUPENTRY) paMmioLookup;
+    R0PTRTYPE(PIOMMMIOLOOKUPENTRY)  paMmioLookup;
     /** MMIO registration table for ring-3.
      * Also mapped to ring-3 as IOM::paMmioRegs. */
-    R0PTRTYPE(PIOMIOPORTENTRYR3)    paMmioRing3Regs;
+    R0PTRTYPE(PIOMMMIOENTRYR3)      paMmioRing3Regs;
     /** Handle to the allocation backing both the ring-0 and ring-3 registration
      * tables as well as the lookup table. */
@@ -823 +823 @@
     uint32_t                        cMmioStatsAllocation;
     /** MMIO lookup table.   */
-    R0PTRTYPE(PIOMIOPORTSTATSENTRY) paMmioStats;
+    R0PTRTYPE(PIOMMMIOSTATSENTRY)   paMmioStats;
     /** Handle to the allocation backing the MMIO statistics. */
     RTR0MEMOBJ                      hMmioStatsMemObj;
@@ -845 +845 @@
 void                iomR0IoPortCleanupVM(PGVM pGVM);
 void                iomR0IoPortInitPerVMData(PGVM pGVM);
+void                iomR0MmioCleanupVM(PGVM pGVM);
+void                iomR0MmioInitPerVMData(PGVM pGVM);
 #endif