Changeset 64115 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Sep 30, 2016 8:14:27 PM (8 years ago)

Author:

vboxsync

Message:

PDM,IOM,PGM: Morphed the MMIO2 API into a mixed MMIO2 and pre-registered MMIO API that is able to deal with really large (<= 64GB) MMIO ranges. Limited testing, so back out at first sign of trouble.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (5 diffs)
• DevPCNet.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -48 +48 @@
 
 
-/* Options *******************************************************************/
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+/** @name E1000 Build Options
+ * @{ */
 /** @def E1K_INIT_RA0
  * E1K_INIT_RA0 forces E1000 to set the first entry in Receive Address filter
@@ -117 +121 @@
  */
 #define E1K_WITH_RXD_CACHE
+/** @def E1K_WITH_PREREG_MMIO
+ * E1K_WITH_PREREG_MMIO enables a new style MMIO registration and is
+ * currently only done for testing the relateted PDM, IOM and PGM code. */
+//#define E1K_WITH_PREREG_MMIO
+/* @} */
 /* End of Options ************************************************************/
 
@@ -6113 +6122 @@
              *    byte enables.
              */
+#ifdef E1K_WITH_PREREG_MMIO
+            pThis->addrMMReg = GCPhysAddress;
+            if (GCPhysAddress == NIL_RTGCPHYS)
+                rc = VINF_SUCCESS;
+            else
+            {
+                Assert(!(GCPhysAddress & 7));
+                rc = PDMDevHlpMMIOExMap(pPciDev->pDevIns, iRegion, GCPhysAddress);
+            }
+#else
             pThis->addrMMReg = GCPhysAddress; Assert(!(GCPhysAddress & 7));
             rc = PDMDevHlpMMIORegister(pPciDev->pDevIns, GCPhysAddress, cb, NULL /*pvUser*/,
@@ -6123 +6142 @@
                 rc = PDMDevHlpMMIORegisterRC(pPciDev->pDevIns, GCPhysAddress, cb, NIL_RTRCPTR /*pvUser*/,
                                              "e1kMMIOWrite", "e1kMMIORead");
+#endif
             break;
 
@@ -7641 +7661 @@
     if (RT_FAILURE(rc))
         return rc;
+#ifdef E1K_WITH_PREREG_MMIO
+    rc = PDMDevHlpMMIOExPreRegister(pDevIns, 0, E1K_MM_SIZE, IOMMMIO_FLAGS_READ_DWORD | IOMMMIO_FLAGS_WRITE_ONLY_DWORD, "E1000",
+                                    NULL        /*pvUserR3*/, e1kMMIOWrite, e1kMMIORead, NULL /*pfnFillR3*/,
+                                    NIL_RTR0PTR /*pvUserR0*/, pThis->fR0Enabled ? "e1kMMIOWrite" : NULL,
+                                    pThis->fR0Enabled ? "e1kMMIORead" : NULL, NULL /*pszFillR0*/,
+                                    NIL_RTRCPTR /*pvUserRC*/, pThis->fRCEnabled ? "e1kMMIOWrite" : NULL,
+                                    pThis->fRCEnabled ? "e1kMMIORead" : NULL, NULL /*pszFillRC*/);
+    AssertLogRelRCReturn(rc, rc);
+#endif
     /* Map our registers to IO space (region 2, see e1kConfigurePCI) */
     rc = PDMDevHlpPCIIORegionRegister(pDevIns, 2, E1K_IOPORT_SIZE, PCI_ADDRESS_SPACE_IO, e1kMap);

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -4418 +4418 @@
     {
         /* drop this dummy region */
-        rc = PDMDevHlpMMIO2Deregister(pDevIns, 2);
+        rc = PDMDevHlpMMIOExDeregister(pDevIns, 2);
         pThis->fSharedRegion = false;
     }