Changeset 35676 in vbox for trunk/include/VBox

Timestamp:

Jan 24, 2011 2:24:34 PM (14 years ago)

Author:

vboxsync

Message:

Main, VMM: PCI passthrough work

Location:

trunk/include/VBox

Files:

• pci.h (modified) (2 diffs)
• vmm/pdmdev.h (modified) (3 diffs)
• vmm/pdmdrv.h (modified) (1 diff)

trunk/include/VBox/pci.h

@@ -984 +984 @@
     return (pDev->Int.s.uFlags & PCIDEV_FLAG_MSIX_CAPABLE) != 0;
 }
+
+DECLINLINE(void) PCISetPassthrough(PPCIDEVICE pDev)
+{
+    pDev->Int.s.uFlags |= PCIDEV_FLAG_PASSTHROUGH;
+}
+
+DECLINLINE(void) PCIClearPassthrough(PPCIDEVICE pDev)
+{
+    pDev->Int.s.uFlags &= ~PCIDEV_FLAG_PASSTHROUGH;
+}
+
+DECLINLINE(bool) PCIIsPassthrough(PPCIDEVICE pDev)
+{
+    return (pDev->Int.s.uFlags & PCIDEV_FLAG_PASSTHROUGH) != 0;
+}
 #endif
 
@@ -1071 +1086 @@
     }
 
-    void fromLong(int32_t value)
+    PciBusAddress& fromLong(int32_t value)
     {
         iBus = (value >> 8) & 0xff;
         iDevice = (value & 0xff) >> 3;
         iFn = (value & 7);
+        return *this;
     }
 };

trunk/include/VBox/vmm/pdmdev.h

@@ -1822 +1822 @@
 #define PDM_HPETHLPR3_VERSION                   PDM_VERSION_MAKE(0xffec, 2, 0)
 
-
+typedef struct PDMPCIRAWREG
+{
+    /** Struct version+magic number (PDM_PCIRAWREG_VERSION). */
+     uint32_t            u32Version;
+} PDMPCIRAWREG;
+
+/** Pointer to a raw PCI registration structure. */
+typedef PDMPCIRAWREG *PPDMPCIRAWREG;
+/** Current PDMPCIRAWREG version number. */
+#define PDM_PCIRAWREG_VERSION                     PDM_VERSION_MAKE(0xffe3, 1, 0)
+struct PDMPCIRAWHLPRC
+{
+    uint32_t u32Version;
+    /** Just a safety precaution. */
+    uint32_t u32TheEnd;
+};
+typedef RCPTRTYPE(PDMPCIRAWHLPRC *) PPDMPCIRAWHLPRC;
+typedef RCPTRTYPE(const PDMPCIRAWHLPRC *) PCPDMPCIRAWHLPRC;
+
+struct PDMPCIRAWHLPR0
+{
+uint32_t u32Version;
+/** Just a safety precaution. */
+uint32_t u32TheEnd;
+};
+typedef R0PTRTYPE(PDMPCIRAWHLPR0 *) PPDMPCIRAWHLPR0;
+typedef R0PTRTYPE(const PDMPCIRAWHLPR0 *) PCPDMPCIRAWHLPR0;
+
+
+typedef struct PDMPCIRAWHLPR3 
+{ 
+uint32_t u32Version; 
+/** 
+* Gets the address of the RC PCI raw helpers. 
+* 
+* This should be called at both construction and relocation time 
+* to obtain the correct address of the RC helpers. 
+* 
+* @returns RC pointer to the PCI raw helpers. 
+* @param   pDevIns         Device instance of the raw PCI device. 
+*/ 
+DECLR3CALLBACKMEMBER(PCPDMPCIRAWHLPRC, pfnGetRCHelpers,(PPDMDEVINS pDevIns)); 
+
+/** 
+* Gets the address of the R0 PCI raw helpers. 
+* 
+* This should be called at both construction and relocation time 
+* to obtain the correct address of the R0 helpers. 
+* 
+* @returns R0 pointer to the PCI raw helpers. 
+* @param   pDevIns         Device instance of the raw PCI device. 
+*/ 
+DECLR3CALLBACKMEMBER(PCPDMPCIRAWHLPR0, pfnGetR0Helpers,(PPDMDEVINS pDevIns)); 
+
+/** Just a safety precaution. */ 
+uint32_t                u32TheEnd; 
+} PDMPCIRAWHLPR3; 
+/** Pointer to raw PCI R3 helpers. */ 
+typedef R3PTRTYPE(PDMPCIRAWHLPR3 *) PPDMPCIRAWHLPR3; 
+/** Pointer to const raw PCI R3 helpers. */ 
+typedef R3PTRTYPE(const PDMPCIRAWHLPR3 *) PCPDMPCIRAWHLPR3; 
+
+/** Current PDMPCIRAWHLPRC version number. */ 
+#define PDM_PCIRAWHLPRC_VERSION                   PDM_VERSION_MAKE(0xfff0, 1, 0) 
+/** Current PDMPCIRAWHLPR0 version number. */ 
+#define PDM_PCIRAWHLPR0_VERSION                   PDM_VERSION_MAKE(0xfff1, 1, 0) 
+/** Current PDMPCIRAWHLPR3 version number. */ 
+#define PDM_PCIRAWHLPR3_VERSION                   PDM_VERSION_MAKE(0xfff2, 1, 0) 
 
 #ifdef IN_RING3
@@ -2921 +2988 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnHPETRegister,(PPDMDEVINS pDevIns, PPDMHPETREG pHpetReg, PCPDMHPETHLPR3 *ppHpetHlpR3));
+
+    /** 
+     * Register the raw PCI device. 
+     * 
+     * @returns VBox status code. 
+     * @param   pDevIns             The device instance. 
+     * @param   pHpetReg            Pointer to a raw PCI registration structure. 
+     * @param   ppHpetHlpR3         Where to store the pointer to the raw PCI 
+     *                              helpers. 
+     */ 
+    DECLR3CALLBACKMEMBER(int, pfnPciRawRegister,(PPDMDEVINS pDevIns, PPDMPCIRAWREG pPciRawReg, PCPDMPCIRAWHLPR3 *ppPciRawHlpR3)); 
 
     /**
@@ -4455 +4533 @@
 }
 
+/** 
+ * @copydoc PDMDEVHLPR3::pfnPciRawRegister 
+ */ 
+DECLINLINE(int) PDMDevHlpPciRawRegister(PPDMDEVINS pDevIns, PPDMPCIRAWREG pPciRawReg, PCPDMPCIRAWHLPR3 *ppPciRawHlpR3) 
+{ 
+    return pDevIns->pHlpR3->pfnPciRawRegister(pDevIns, pPciRawReg, ppPciRawHlpR3); 
+} 
+
 /**
  * @copydoc PDMDEVHLPR3::pfnDMACRegister

trunk/include/VBox/vmm/pdmdrv.h

@@ -338 +338 @@
 /** SCSI driver. */
 #define PDM_DRVREG_CLASS_SCSI           RT_BIT(15)
+/** Generic raw PCI device driver. */ 
+#define PDM_DRVREG_CLASS_PCIRAW         RT_BIT(16) 
 /** @} */