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

Timestamp:

Apr 6, 2009 9:28:14 AM (16 years ago)

Author:

vboxsync

Message:

pcnet: another correction for the physwrite hack

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (5 diffs)

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

@@ -852 +852 @@
         rda[1] &= ~0x80000000;
         PDMDevHlpPhysWrite(pDevIns, addr+7, (uint8_t*)rda + 7, 1);
+    }
+}
+
+/**
+ * Read+Write a TX/RX descriptor to prevent PDMDevHlpPhysWrite() allocating
+ * pages later when we shouldn't schedule to EMT. Temporarily hack.
+ */
+static void pcnetDescTouch(PCNetState *pThis, RTGCPHYS32 addr)
+{
+    PPDMDEVINS pDevIns = PCNETSTATE_2_DEVINS(pThis);
+
+    if (!pThis->fPrivIfEnabled)
+    {
+        uint8_t aBuf[16];
+        size_t cbDesc;
+        if (RT_UNLIKELY(BCR_SWSTYLE(pThis) == 0))
+            cbDesc = 8;
+        else
+            cbDesc = 16;
+        PDMDevHlpPhysRead(pDevIns, addr, aBuf, cbDesc);
+        PDMDevHlpPhysWrite(pDevIns, addr, aBuf, cbDesc);
     }
 }
@@ -1550 +1571 @@
         RMD        rmd;
         RTGCPHYS32 rdaddr = PHYSADDR(pThis, pcnetRdraAddr(pThis, i));
+
+        pcnetDescTouch(pThis, rdaddr);
         /* At this time it is not guaranteed that the buffers are already initialized. */
         if (pcnetRmdLoad(pThis, &rmd, rdaddr, false))
@@ -1563 +1586 @@
             cbRxBuffers += cbBuf;
         }
-        PDMDevHlpPhysWrite(pDevIns, rdaddr, (void*)&rmd, sizeof(rmd));
     }
 
@@ -1570 +1592 @@
         TMD        tmd;
         RTGCPHYS32 tdaddr = PHYSADDR(pThis, pcnetTdraAddr(pThis, i));
+
+        pcnetDescTouch(pThis, tdaddr);
         if (pcnetTmdLoad(pThis, &tmd, tdaddr, false))
         {
@@ -1582 +1606 @@
             PDMDevHlpPhysWrite(pDevIns, tbadr, aBuf, RT_MIN(sizeof(aBuf), cbBuf));
         }
-        PDMDevHlpPhysWrite(pDevIns, tdaddr, (void*)&tmd, sizeof(tmd));
     }