Changeset 41825 in vbox

Timestamp:

Jun 19, 2012 2:14:28 PM (13 years ago)

Author:

vboxsync

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

78650

Message:

PCI/DevATA: Put PCIDevPhysRead/Write into PDMDevHlpPCIDevPhysRead/Write, introduced VINF_PGM_PCI_PHYS_READ/WRITE_BM_DISABLED codes.

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• include/VBox/pci.h (modified) (1 diff)
• include/VBox/vmm/pdmdev.h (modified) (5 diffs)
• src/VBox/Devices/Bus/DevPCI.cpp (modified) (1 diff)
• src/VBox/Devices/Storage/DevATA.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -569 +569 @@
 /** PCI passthru is not supported by this build. */
 #define VERR_PGM_PCI_PASSTHRU_MISCONFIG         (-1682)
+/** PCI physical read with bus mastering disabled. */
+#define VINF_PGM_PCI_PHYS_READ_BM_DISABLED      (1683)
+/** PCI physical write with bus mastering disabled. */
+#define VINF_PGM_PCI_PHYS_WRITE_BM_DISABLED     (1684)
 /** @} */
 

trunk/include/VBox/pci.h

@@ -538 +538 @@
 } PCIDEVICE;
 
-#ifdef IN_RING3
-int PCIDevPhysRead(PPCIDEVICE pPciDev, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead);
-int PCIDevPhysWrite(PPCIDEVICE pPciDev, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite);
-#endif
-
 /* @todo: handle extended space access */
 DECLINLINE(void)     PCIDevSetByte(PPCIDEVICE pPciDev, uint32_t uOffset, uint8_t u8Value)

trunk/include/VBox/vmm/pdmdev.h

@@ -1300 +1300 @@
     /**
      * Calculates an IRQ tag for a timer, IPI or similar event.
-     *  
-     * @returns The IRQ tag. 
-     * @param   pDevIns         Device instance of the APIC. 
-     * @param   u8Level         PDM_IRQ_LEVEL_HIGH or PDM_IRQ_LEVEL_FLIP_FLOP. 
+     *
+     * @returns The IRQ tag.
+     * @param   pDevIns         Device instance of the APIC.
+     * @param   u8Level         PDM_IRQ_LEVEL_HIGH or PDM_IRQ_LEVEL_FLIP_FLOP.
      */
     DECLRCCALLBACKMEMBER(uint32_t, pfnCalcIrqTag,(PPDMDEVINS pDevIns, uint8_t u8Level));
@@ -1379 +1379 @@
     /**
      * Calculates an IRQ tag for a timer, IPI or similar event.
-     *  
-     * @returns The IRQ tag. 
-     * @param   pDevIns         Device instance of the APIC. 
-     * @param   u8Level         PDM_IRQ_LEVEL_HIGH or PDM_IRQ_LEVEL_FLIP_FLOP. 
+     *
+     * @returns The IRQ tag.
+     * @param   pDevIns         Device instance of the APIC.
+     * @param   u8Level         PDM_IRQ_LEVEL_HIGH or PDM_IRQ_LEVEL_FLIP_FLOP.
      */
     DECLR0CALLBACKMEMBER(uint32_t, pfnCalcIrqTag,(PPDMDEVINS pDevIns, uint8_t u8Level));
@@ -1457 +1457 @@
     /**
      * Calculates an IRQ tag for a timer, IPI or similar event.
-     *  
-     * @returns The IRQ tag. 
-     * @param   pDevIns         Device instance of the APIC. 
-     * @param   u8Level         PDM_IRQ_LEVEL_HIGH or PDM_IRQ_LEVEL_FLIP_FLOP. 
+     *
+     * @returns The IRQ tag.
+     * @param   pDevIns         Device instance of the APIC.
+     * @param   u8Level         PDM_IRQ_LEVEL_HIGH or PDM_IRQ_LEVEL_FLIP_FLOP.
      */
     DECLR3CALLBACKMEMBER(uint32_t, pfnCalcIrqTag,(PPDMDEVINS pDevIns, uint8_t u8Level));
@@ -4614 +4614 @@
 }
 
-
 /**
  * @copydoc PDMDEVHLPR3::pfnPCISetConfigCallbacks
@@ -4622 +4621 @@
 {
     pDevIns->pHlpR3->pfnPCISetConfigCallbacks(pDevIns, pPciDev, pfnRead, ppfnReadOld, pfnWrite, ppfnWriteOld);
+}
+
+/**
+ * Reads data via bus mastering, if enabled. If no bus mastering is available,
+ * this function does nothing and returns VINF_NOT_SUPPORTED.
+ *
+ * @return  IPRT status code.
+ */
+DECLINLINE(int) PDMDevHlpPCIDevPhysRead(PPCIDEVICE pPciDev, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead)
+{
+    AssertPtrReturn(pPciDev, VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
+    AssertReturn(cbRead, VERR_INVALID_PARAMETER);
+
+    if (!PCIDevIsBusmaster(pPciDev))
+    {
+#ifdef DEBUG
+        Log2(("%s: %RU16:%RU16: No bus master (anymore), skipping read %p (%z)\n", __FUNCTION__,
+              PCIDevGetVendorId(pPciDev), PCIDevGetDeviceId(pPciDev), pvBuf, cbRead));
+#endif
+        return VINF_PGM_PCI_PHYS_READ_BM_DISABLED;
+    }
+
+    return PDMDevHlpPhysRead(pPciDev->pDevIns, GCPhys, pvBuf, cbRead);
+}
+
+/**
+ * Writes data via bus mastering, if enabled. If no bus mastering is available,
+ * this function does nothing and returns VINF_NOT_SUPPORTED.
+ *
+ * @return  IPRT status code.
+ */
+DECLINLINE(int) PDMDevHlpPCIDevPhysWrite(PPCIDEVICE pPciDev, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite)
+{
+    AssertPtrReturn(pPciDev, VERR_INVALID_POINTER);
+    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
+    AssertReturn(cbWrite, VERR_INVALID_PARAMETER);
+
+    if (!PCIDevIsBusmaster(pPciDev))
+    {
+#ifdef DEBUG
+        Log2(("%s: %RU16:%RU16: No bus master (anymore), skipping write %p (%z)\n", __FUNCTION__,
+              PCIDevGetVendorId(pPciDev), PCIDevGetDeviceId(pPciDev), pvBuf, cbWrite));
+#endif
+        return VINF_PGM_PCI_PHYS_WRITE_BM_DISABLED;
+    }
+
+    return PDMDevHlpPhysWrite(pPciDev->pDevIns, GCPhys, pvBuf, cbWrite);
 }
 

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -242 +242 @@
 
 #ifdef IN_RING3
-/**
- * Reads data via bus mastering, if enabled. If no bus mastering is available,
- * this function does nothing and returns VINF_NOT_SUPPORTED.
- *
- * @return  IPRT status code.
- */
-int PCIDevPhysRead(PPCIDEVICE pPciDev, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead)
-{
-    AssertPtrReturn(pPciDev, VERR_INVALID_POINTER);
-    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
-    AssertReturn(cbRead, VERR_INVALID_PARAMETER);
-
-    if (!PCIDevIsBusmaster(pPciDev))
-    {
-#ifdef DEBUG
-        Log2(("%s: %RU16:%RU16: No bus master (anymore), skipping read %p (%z)\n", __FUNCTION__,
-              PCIDevGetVendorId(pPciDev), PCIDevGetDeviceId(pPciDev), pvBuf, cbRead));
-#endif
-        return VINF_NOT_SUPPORTED;
-    }
-
-    return PDMDevHlpPhysRead(pPciDev->pDevIns, GCPhys, pvBuf, cbRead);
-}
-
-/**
- * Writes data via bus mastering, if enabled. If no bus mastering is available,
- * this function does nothing and returns VINF_NOT_SUPPORTED.
- *
- * @return  IPRT status code.
- */
-int PCIDevPhysWrite(PPCIDEVICE pPciDev, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite)
-{
-    AssertPtrReturn(pPciDev, VERR_INVALID_POINTER);
-    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
-    AssertReturn(cbWrite, VERR_INVALID_PARAMETER);
-
-    if (!PCIDevIsBusmaster(pPciDev))
-    {
-#ifdef DEBUG
-        Log2(("%s: %RU16:%RU16: No bus master (anymore), skipping write %p (%z)\n", __FUNCTION__,
-              PCIDevGetVendorId(pPciDev), PCIDevGetDeviceId(pPciDev), pvBuf, cbWrite));
-#endif
-        return VINF_NOT_SUPPORTED;
-    }
-
-    return PDMDevHlpPhysWrite(pPciDev->pDevIns, GCPhys, pvBuf, cbWrite);
-}
-
 static void pci_update_mappings(PCIDevice *d)
 {

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -5017 +5017 @@
                 AssertPtr(pATAState);
                 if (uTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
-                    PCIDevPhysWrite(&pATAState->dev, pBuffer, s->CTX_SUFF(pbIOBuffer) + iIOBufferCur, dmalen);
+                    PDMDevHlpPCIDevPhysWrite(&pATAState->dev, pBuffer, s->CTX_SUFF(pbIOBuffer) + iIOBufferCur, dmalen);
                 else
-                    PCIDevPhysRead(&pATAState->dev, pBuffer, s->CTX_SUFF(pbIOBuffer) + iIOBufferCur, dmalen);
+                    PDMDevHlpPCIDevPhysRead(&pATAState->dev, pBuffer, s->CTX_SUFF(pbIOBuffer) + iIOBufferCur, dmalen);
 
                 iIOBufferCur += dmalen;