Changeset 36716 in vbox

Timestamp:

Apr 18, 2011 2:17:17 PM (14 years ago)

Author:

vboxsync

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

71232

Message:

PCI: 64-bit BARs tweaks, release logs on device attach, allow extended register space access

Location:

trunk

Files:

• include/VBox/pci.h (modified) (2 diffs)
• src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (6 diffs)

trunk/include/VBox/pci.h

@@ -1049 +1049 @@
     }
 
+    PciBusAddress(int32_t iAddr)
+    {
+        clear();
+        fromLong(iAddr);
+    }
+
     PciBusAddress& clear()
     {
@@ -1140 +1146 @@
         return true;
     }
+
+    static const size_t cMaxAddrSize = 10;
 };
 #endif /* __cplusplus */

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

@@ -299 +299 @@
     int rc = VINF_SUCCESS;
 
-    if (pAddr->iRegister > 0xff)
-    {
-        LogRel(("PCI: attempt to write extended register: %x (%d) <- val\n", pAddr->iRegister, cb, val));
-        goto out;
-    }
-
     if (pAddr->iBus != 0)
     {
@@ -403 +397 @@
 {
     int rc = VINF_SUCCESS;
-
-    if (pPciAddr->iRegister > 0xff)
-    {
-        LogRel(("PCI: attempt to read extended register: %x\n", pPciAddr->iRegister));
-        ich9pciNoMem(pu32, cb);
-        goto out;
-    }
-
 
     if (pPciAddr->iBus != 0)
@@ -949 +935 @@
          pPciDev->name, iRegion, cbRegion, enmType));
 
+    /* Make sure that we haven't marked this region as continuation of 64-bit region. */
+    Assert(pPciDev->Int.s.aIORegions[iRegion].type != 0xff);
+
     /*
      * Register the I/O region.
@@ -957 +946 @@
     pRegion->type        = enmType;
     pRegion->map_func    = pfnCallback;
+
+    if ((enmType & PCI_ADDRESS_SPACE_BAR64) != 0)
+    {
+        AssertMsgReturn(iRegion  < 4,
+                        ("Region %d cannot be 64-bit\n", iRegion),
+                        VERR_INVALID_PARAMETER);
+        /* Mark next region as continuation of this one. */
+        pPciDev->Int.s.aIORegions[iRegion+1].type = 0xff;
+    }
 
     /* Set type in the PCI config space. */
@@ -1911 +1909 @@
 {
     PCIIORegion * pRegion = &aDev->Int.s.aIORegions[iRegion];
-
-    int iRegionSize = pRegion->size;
+    int64_t iRegionSize = pRegion->size;
 
     Log3(("ich9pciWriteBarByte: region=%d off=%d val=%x size=%d\n",
          iRegion, iOffset, u8Val, iRegionSize));
+
+    if (iOffset > 3)
+        Assert((aDev->Int.s.aIORegions[iRegion].type & PCI_ADDRESS_SPACE_BAR64) != 0);
+
+    /* Check if we're writing to upper part of 64-bit BAR. */
+    if (aDev->Int.s.aIORegions[iRegion].type == 0xff)
+    {
+        ich9pciWriteBarByte(aDev, iRegion-1, iOffset+4, u8Val);
+        return;
+    }
 
     /* Region doesn't exist */
@@ -1924 +1931 @@
     /* Region size must be power of two */
     Assert((iRegionSize & (iRegionSize - 1)) == 0);
-    uint8_t uMask = (((uint32_t)iRegionSize - 1) >> (iOffset*8) ) & 0xff;
+    uint8_t uMask = ((iRegionSize - 1) >> (iOffset*8) ) & 0xff;
 
     if (iOffset == 0)