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

Timestamp:

Mar 2, 2013 2:28:37 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84072

Message:

Relevant PDMDevHlpPhysWrite changed to PDMDevHlpPCIPhysWrite. If this breaks anything, add PDM_DO_NOT_RESPECT_PCI_BM_BIT to VMM_COMMON_DEFS to disable the feature.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (4 diffs)
• DevPCNet.cpp (modified) (8 diffs)
• DevVirtioNet.cpp (modified) (2 diffs)

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

@@ -2109 +2109 @@
     // uint32_t rdh = RDH;
     // Assert(pThis->aRxDescAddr[pDesc - pThis->aRxDescriptors] == addr);
-    PDMDevHlpPhysWrite(pThis->CTX_SUFF(pDevIns),
-                       e1kDescAddr(RDBAH, RDBAL, RDH),
-                       pDesc, sizeof(E1KRXDESC));
+    PDMDevHlpPCIPhysWrite(pThis->CTX_SUFF(pDevIns),
+                          e1kDescAddr(RDBAH, RDBAL, RDH),
+                          pDesc, sizeof(E1KRXDESC));
     e1kAdvanceRDH(pThis);
     e1kPrintRDesc(pThis, pDesc);
@@ -2129 +2129 @@
     E1kLog2(("%s e1kStoreRxFragment: store fragment of %04X at %016LX, EOP=%d\n",
              pThis->szPrf, cb, pDesc->u64BufAddr, pDesc->status.fEOP));
-    PDMDevHlpPhysWrite(pThis->CTX_SUFF(pDevIns), pDesc->u64BufAddr, pvBuf, cb);
+    PDMDevHlpPCIPhysWrite(pThis->CTX_SUFF(pDevIns), pDesc->u64BufAddr, pvBuf, cb);
     pDesc->u16Length = (uint16_t)cb;                        Assert(pDesc->u16Length == cb);
     STAM_PROFILE_ADV_STOP(&pThis->StatReceiveStore, a);
@@ -2151 +2151 @@
     STAM_PROFILE_ADV_START(&pThis->StatReceiveStore, a);
     E1kLog2(("%s e1kStoreRxFragment: store fragment of %04X at %016LX, EOP=%d\n", pThis->szPrf, cb, pDesc->u64BufAddr, pDesc->status.fEOP));
-    PDMDevHlpPhysWrite(pThis->CTX_SUFF(pDevIns), pDesc->u64BufAddr, pvBuf, cb);
+    PDMDevHlpPCIPhysWrite(pThis->CTX_SUFF(pDevIns), pDesc->u64BufAddr, pvBuf, cb);
     pDesc->u16Length = (uint16_t)cb;                        Assert(pDesc->u16Length == cb);
     /* Write back the descriptor */
-    PDMDevHlpPhysWrite(pThis->CTX_SUFF(pDevIns), e1kDescAddr(RDBAH, RDBAL, RDH), pDesc, sizeof(E1KRXDESC));
+    PDMDevHlpPCIPhysWrite(pThis->CTX_SUFF(pDevIns), e1kDescAddr(RDBAH, RDBAL, RDH), pDesc, sizeof(E1KRXDESC));
     e1kPrintRDesc(pThis, pDesc);
     E1kLogRel(("E1000: Wrote back RX desc, RDH=%x\n", RDH));
@@ -3688 +3688 @@
     /* Only the last half of the descriptor has to be written back. */
     e1kPrintTDesc(pThis, pDesc, "^^^");
-    PDMDevHlpPhysWrite(pThis->CTX_SUFF(pDevIns), addr, pDesc, sizeof(E1KTXDESC));
+    PDMDevHlpPCIPhysWrite(pThis->CTX_SUFF(pDevIns), addr, pDesc, sizeof(E1KTXDESC));
 }
 

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

@@ -742 +742 @@
         xda[3] =   ((uint32_t *)tmd)[2] >> 16;
         xda[1] |=  0x8000;
-        PDMDevHlpPhysWrite(pDevIns, addr, (void*)&xda[0], sizeof(xda));
+        PDMDevHlpPCIPhysWrite(pDevIns, addr, (void*)&xda[0], sizeof(xda));
         xda[1] &= ~0x8000;
-        PDMDevHlpPhysWrite(pDevIns, addr+3, (uint8_t*)xda + 3, 1);
+        PDMDevHlpPCIPhysWrite(pDevIns, addr+3, (uint8_t*)xda + 3, 1);
     }
     else if (RT_LIKELY(BCR_SWSTYLE(pThis) != 3))
     {
         ((uint32_t*)tmd)[1] |=  0x80000000;
-        PDMDevHlpPhysWrite(pDevIns, addr, (void*)tmd, 16);
+        PDMDevHlpPCIPhysWrite(pDevIns, addr, (void*)tmd, 16);
         ((uint32_t*)tmd)[1] &= ~0x80000000;
-        PDMDevHlpPhysWrite(pDevIns, addr+7, (uint8_t*)tmd + 7, 1);
+        PDMDevHlpPCIPhysWrite(pDevIns, addr+7, (uint8_t*)tmd + 7, 1);
     }
     else
@@ -761 +761 @@
         xda[3] = ((uint32_t *)tmd)[3];
         xda[1] |=  0x80000000;
-        PDMDevHlpPhysWrite(pDevIns, addr, (void*)&xda[0], sizeof(xda));
+        PDMDevHlpPCIPhysWrite(pDevIns, addr, (void*)&xda[0], sizeof(xda));
         xda[1] &= ~0x80000000;
-        PDMDevHlpPhysWrite(pDevIns, addr+7, (uint8_t*)xda + 7, 1);
+        PDMDevHlpPCIPhysWrite(pDevIns, addr+7, (uint8_t*)xda + 7, 1);
     }
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatTmdStore), a);
@@ -860 +860 @@
         rda[3] =   ((uint32_t *)rmd)[2]      & 0xffff;
         rda[1] |=  0x8000;
-        PDMDevHlpPhysWrite(pDevIns, addr, (void*)&rda[0], sizeof(rda));
+        PDMDevHlpPCIPhysWrite(pDevIns, addr, (void*)&rda[0], sizeof(rda));
         rda[1] &= ~0x8000;
-        PDMDevHlpPhysWrite(pDevIns, addr+3, (uint8_t*)rda + 3, 1);
+        PDMDevHlpPCIPhysWrite(pDevIns, addr+3, (uint8_t*)rda + 3, 1);
     }
     else if (RT_LIKELY(BCR_SWSTYLE(pThis) != 3))
     {
         ((uint32_t*)rmd)[1] |=  0x80000000;
-        PDMDevHlpPhysWrite(pDevIns, addr, (void*)rmd, 16);
+        PDMDevHlpPCIPhysWrite(pDevIns, addr, (void*)rmd, 16);
         ((uint32_t*)rmd)[1] &= ~0x80000000;
-        PDMDevHlpPhysWrite(pDevIns, addr+7, (uint8_t*)rmd + 7, 1);
+        PDMDevHlpPCIPhysWrite(pDevIns, addr+7, (uint8_t*)rmd + 7, 1);
     }
     else
@@ -879 +879 @@
         rda[3] = ((uint32_t *)rmd)[3];
         rda[1] |=  0x80000000;
-        PDMDevHlpPhysWrite(pDevIns, addr, (void*)&rda[0], sizeof(rda));
+        PDMDevHlpPCIPhysWrite(pDevIns, addr, (void*)&rda[0], sizeof(rda));
         rda[1] &= ~0x80000000;
-        PDMDevHlpPhysWrite(pDevIns, addr+7, (uint8_t*)rda + 7, 1);
+        PDMDevHlpPCIPhysWrite(pDevIns, addr+7, (uint8_t*)rda + 7, 1);
     }
 }
@@ -887 +887 @@
 #ifdef IN_RING3
 /**
- * Read+Write a TX/RX descriptor to prevent PDMDevHlpPhysWrite() allocating
+ * Read+Write a TX/RX descriptor to prevent PDMDevHlpPCIPhysWrite() allocating
  * pages later when we shouldn't schedule to EMT. Temporarily hack.
  */
@@ -903 +903 @@
             cbDesc = 16;
         PDMDevHlpPhysRead(pDevIns, addr, aBuf, cbDesc);
-        PDMDevHlpPhysWrite(pDevIns, addr, aBuf, cbDesc);
+        PDMDevHlpPCIPhysWrite(pDevIns, addr, aBuf, cbDesc);
     }
 }
@@ -2001 +2001 @@
              */
             PDMCritSectLeave(&pThis->CritSect);
-            PDMDevHlpPhysWrite(pDevIns, rbadr, src, cbBuf);
+            PDMDevHlpPCIPhysWrite(pDevIns, rbadr, src, cbBuf);
             int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
             AssertReleaseRC(rc);
@@ -2048 +2048 @@
                  * handler associated with it. See above for additional comments. */
                 PDMCritSectLeave(&pThis->CritSect);
-                PDMDevHlpPhysWrite(pDevIns, rbadr2, src, cbBuf);
+                PDMDevHlpPCIPhysWrite(pDevIns, rbadr2, src, cbBuf);
                 rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
                 AssertReleaseRC(rc);

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

@@ -861 +861 @@
     {
         Hdr.u16NumBufs = nElem;
-        int rc = PDMDevHlpPhysWrite(pThis->VPCI.CTX_SUFF(pDevIns), addrHdrMrx,
-                                    &Hdr, sizeof(Hdr));
+        int rc = PDMDevHlpPCIPhysWrite(pThis->VPCI.CTX_SUFF(pDevIns), addrHdrMrx,
+                                       &Hdr, sizeof(Hdr));
         if (RT_FAILURE(rc))
         {
@@ -1540 +1540 @@
             Log(("%s Processed control message %u, ack=%u.\n", INSTANCE(pThis),
                  CtlHdr.u8Class, u8Ack));
-            PDMDevHlpPhysWrite(pThis->VPCI.CTX_SUFF(pDevIns),
-                               elem.aSegsIn[elem.nIn - 1].addr,
-                               &u8Ack, sizeof(u8Ack));
+            PDMDevHlpPCIPhysWrite(pThis->VPCI.CTX_SUFF(pDevIns),
+                                  elem.aSegsIn[elem.nIn - 1].addr,
+                                  &u8Ack, sizeof(u8Ack));
         }
         vqueuePut(&pThis->VPCI, pQueue, &elem, sizeof(u8Ack));