Changeset 36678 in vbox

Timestamp:

Apr 15, 2011 9:24:13 AM (14 years ago)

Author:

vboxsync

Message:

PCI: cleanups, R3 mapping work

Location:

trunk

Files:

• include/VBox/pci.h (modified) (5 diffs)
• src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (1 diff)
• src/VBox/HostDrivers/VBoxPci/VBoxPci.c (modified) (9 diffs)

trunk/include/VBox/pci.h

@@ -55 +55 @@
  * This is used when registering a I/O region.
  */
-/** Note: There are all sorts of dirty dependencies on the values in the
- *  pci device. Be careful when changing this.
+/**
+ * Defined by the PCI specification.
  */
 typedef enum PCIADDRESSSPACE
@@ -88 +88 @@
  * @param   enmType         One of the PCI_ADDRESS_SPACE_* values.
  *
- * @remarks The address is *NOT* relative to pci_mem_base.
  */
 typedef DECLCALLBACK(int) FNPCIIOREGIONMAP(PPCIDEVICE pPciDev, /*unsigned*/ int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType);
@@ -1024 +1023 @@
  * Class representing PCI address. PCI device consist of
  * bus, device and function numbers. Generally device PCI
- * address could be changed during runtime, but only by 
+ * address could be changed during runtime, but only by
  * an OS PCI driver.
  *
@@ -1109 +1108 @@
     bool valid() const
     {
-        return (miBus    != -1) 
-            && (miDevice != -1) 
+        return (miBus    != -1)
+            && (miDevice != -1)
             && (miFn     != -1);
     }
@@ -1133 +1132 @@
         if (cBufSize < (/* bus */ 2 + /* : */ 1 + /* device */ 2 + /* . */ 1 + /* function*/ 1 + /* \0 */1))
             return false;
-        
+
         if (valid())
             RTStrPrintf(szBuf, cBufSize, "%02x:%02x.%01x", miBus, miDevice, miFn);
         else
             RTStrPrintf(szBuf, cBufSize, "%s", "<bad>");
-        
+
         return true;
     }

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

@@ -958 +958 @@
     pRegion->map_func    = pfnCallback;
 
-    /* Set type in the config space. */
-    uint32_t u32Address = ich9pciGetRegionReg(iRegion);
-    uint32_t u32Value   =
-          (((enmType & PCI_ADDRESS_SPACE_MEM_PREFETCH) != 0) ? (1 << 3) : 0)
-        | (((enmType & PCI_ADDRESS_SPACE_IO) != 0)  ? 1 : 0);
-    PCIDevSetDWord(pPciDev, u32Address, u32Value);
+    /* Set type in the PCI config space. */
+    uint32_t u32Value   = ((uint32_t)enmType) & (PCI_ADDRESS_SPACE_IO | PCI_ADDRESS_SPACE_BAR64 | PCI_ADDRESS_SPACE_MEM_PREFETCH);
+    PCIDevSetDWord(pPciDev, ich9pciGetRegionReg(iRegion), u32Value);
 
     return VINF_SUCCESS;

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c

@@ -190 +190 @@
 
     vboxPciDevLock(pThis);
-    
+
     if (pThis->IrqHandler.pfnIrqHandler)
     {
@@ -243 +243 @@
 static DECLCALLBACK(int) vboxPciDevGetRegionInfo(PRAWPCIDEVPORT pPort,
                                                  int32_t        iRegion,
-                                                 RTHCPHYS       *pRegionStart,
-                                                 uint64_t       *pu64RegionSize,
-                                                 bool           *pfPresent,
+                                                 RTHCPHYS       *pRegionStart,
+                                                 uint64_t       *pu64RegionSize,
+                                                 bool           *pfPresent,
                                                  uint32_t        *pfFlags)
 {
@@ -266 +266 @@
 static DECLCALLBACK(int) vboxPciDevMapRegion(PRAWPCIDEVPORT pPort,
                                              int32_t        iRegion,
-                                             RTHCPHYS       RegionStart,
-                                             uint64_t       u64RegionSize,
+                                             RTHCPHYS       RegionStart,
+                                             uint64_t       u64RegionSize,
                                              int32_t        fFlags,
                                              RTR0PTR        *pRegionBase)
@@ -288 +288 @@
 static DECLCALLBACK(int) vboxPciDevUnmapRegion(PRAWPCIDEVPORT pPort,
                                                int32_t        iRegion,
-                                               RTHCPHYS       RegionStart,
-                                               uint64_t       u64RegionSize,
+                                               RTHCPHYS       RegionStart,
+                                               uint64_t       u64RegionSize,
                                                RTR0PTR        RegionBase)
 {
@@ -307 +307 @@
  * @copydoc RAWPCIDEVPORT:: pfnPciCfgRead
  */
-static DECLCALLBACK(int) vboxPciDevPciCfgRead(PRAWPCIDEVPORT pPort, uint32_t Register, PCIRAWMEMLOC *pValue)
+static DECLCALLBACK(int) vboxPciDevPciCfgRead(PRAWPCIDEVPORT pPort, 
+                                              uint32_t       Register, 
+                                              PCIRAWMEMLOC   *pValue)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
@@ -325 +327 @@
  * @copydoc RAWPCIDEVPORT:: pfnPciCfgWrite
  */
-static DECLCALLBACK(int) vboxPciDevPciCfgWrite(PRAWPCIDEVPORT pPort, uint32_t Register, PCIRAWMEMLOC *pValue)
+static DECLCALLBACK(int) vboxPciDevPciCfgWrite(PRAWPCIDEVPORT pPort, 
+                                               uint32_t       Register, 
+                                               PCIRAWMEMLOC   *pValue)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
@@ -339 +343 @@
 }
 
-static DECLCALLBACK(int) vboxPciDevRegisterIrqHandler(PRAWPCIDEVPORT pPort, PFNRAWPCIISR pfnHandler, void* pIrqContext, PCIRAWISRHANDLE *phIsr)
+static DECLCALLBACK(int) vboxPciDevRegisterIrqHandler(PRAWPCIDEVPORT  pPort, 
+                                                      PFNRAWPCIISR    pfnHandler, 
+                                                      void*           pIrqContext, 
+                                                      PCIRAWISRHANDLE *phIsr)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
     int     rc;
-    int32_t iHostIrq = 0;    
+    int32_t iHostIrq = 0;
 
     if (pfnHandler == NULL)
@@ -365 +372 @@
         }
     }
-        
-    vboxPciDevUnlock(pThis);
-
-    return rc;
-}
-
-static DECLCALLBACK(int) vboxPciDevUnregisterIrqHandler(PRAWPCIDEVPORT pPort, PCIRAWISRHANDLE hIsr)
+
+    vboxPciDevUnlock(pThis);
+
+    return rc;
+}
+
+static DECLCALLBACK(int) vboxPciDevUnregisterIrqHandler(PRAWPCIDEVPORT  pPort, 
+                                                        PCIRAWISRHANDLE hIsr)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
@@ -393 +401 @@
 }
 
-static DECLCALLBACK(int) vboxPciDevPowerStateChange(PRAWPCIDEVPORT pPort, PCIRAWPOWERSTATE  aState, uint64_t *pu64Param)
+static DECLCALLBACK(int) vboxPciDevPowerStateChange(PRAWPCIDEVPORT    pPort, 
+                                                    PCIRAWPOWERSTATE  aState, 
+                                                    uint64_t          *pu64Param)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);