Changeset 36138 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Mar 3, 2011 10:44:55 AM (14 years ago)

Author:

vboxsync

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

70318

Message:

PCI: some of 64-bit BARs support (many real cards do that)

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPciIch9.cpp (modified) (5 diffs)
• PCIInternal.h (modified) (1 diff)

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

@@ -895 +895 @@
      * Validate.
      */
-    AssertMsgReturn(   enmType == PCI_ADDRESS_SPACE_MEM
-                    || enmType == PCI_ADDRESS_SPACE_IO
-                    || enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH,
+    AssertMsgReturn(   enmType == (PCI_ADDRESS_SPACE_MEM | PCI_ADDRESS_SPACE_BAR32)
+                    || enmType == (PCI_ADDRESS_SPACE_MEM_PREFETCH | PCI_ADDRESS_SPACE_BAR32)
+                    || enmType == (PCI_ADDRESS_SPACE_MEM | PCI_ADDRESS_SPACE_BAR64)
+                    || enmType == (PCI_ADDRESS_SPACE_MEM_PREFETCH | PCI_ADDRESS_SPACE_BAR64)
+                    || enmType ==  PCI_ADDRESS_SPACE_IO
+                    ,
                     ("Invalid enmType=%#x? Or was this a bitmask after all...\n", enmType),
                     VERR_INVALID_PARAMETER);
@@ -909 +912 @@
                     VERR_INVALID_PARAMETER);
 
+    Log(("ich9pciIORegionRegister: %s region %d size %d type %x\n",
+         pPciDev->name, iRegion, cbRegion, enmType));
+
     /*
      * Register the I/O region.
@@ -920 +926 @@
     /* Set type in the config space. */
     uint32_t u32Address = ich9pciGetRegionReg(iRegion);
-    uint32_t u32Value   =   (enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH ? (1 << 3) : 0)
-                          | (enmType == PCI_ADDRESS_SPACE_IO ? 1 : 0);
+    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);
 
@@ -1600 +1607 @@
     uint16_t uDevClass, uVendor, uDevice;
     uint8_t uCmd;
-
+    
     uDevClass  = ich9pciConfigRead(pGlobals, uBus, uDevFn, VBOX_PCI_CLASS_DEVICE, 2);
     uVendor    = ich9pciConfigRead(pGlobals, uBus, uDevFn, VBOX_PCI_VENDOR_ID, 2);
@@ -2584 +2591 @@
                            VBOX_PCI_COMMAND_MEMORY |
                            VBOX_PCI_COMMAND_MASTER));
-        
+
         /* Bridge device reset handlers processed later */
         if (!pciDevIsPci2PciBridge(pDev))

trunk/src/VBox/Devices/Bus/PCIInternal.h

@@ -24 +24 @@
 typedef struct PCIIOREGION
 {
-    /** Current PCI mapping address, 0xffffffff means not mapped.
-        @todo: make address and size 64-bit. */
-    uint32_t                        addr;
-    uint32_t                        size;
+    /** Current PCI mapping address, 0xffffffff means not mapped. */
+    uint64_t                        addr;
+    uint64_t                        size;
     uint8_t                         type; /* PCIADDRESSSPACE */
     uint8_t                         padding[HC_ARCH_BITS == 32 ? 3 : 7];