Changeset 34268 in vbox

Timestamp:

Nov 22, 2010 9:41:24 PM (14 years ago)

Author:

vboxsync

Message:

PCI: some 64-bit BARs bits

Location:

trunk

Files:

• include/VBox/pci.h (modified) (2 diffs)
• src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (1 diff)
• src/VBox/Devices/Bus/PCIInternal.h (modified) (3 diffs)

trunk/include/VBox/pci.h

@@ -57 +57 @@
 /** Note: There are all sorts of dirty dependencies on the values in the
  *  pci device. Be careful when changing this.
- *  @todo we should introduce 32 & 64 bits physical address types
  */
 typedef enum PCIADDRESSSPACE
@@ -65 +64 @@
     /** I/O space. */
     PCI_ADDRESS_SPACE_IO = 0x01,
+    /** 32-bit BAR. */
+    PCI_ADDRESS_SPACE_BAR32 = 0x00,
+    /** 64-bit BAR. */
+    PCI_ADDRESS_SPACE_BAR64 = 0x04,
     /** Prefetch memory. */
     PCI_ADDRESS_SPACE_MEM_PREFETCH = 0x08

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

@@ -720 +720 @@
         if (iRegionSize == 0)
             continue;
+
+        AssertMsg((pRegion->type & PCI_ADDRESS_SPACE_BAR64) == 0, ("64-bit BARs not yet implemented\n"));
 
         if (pRegion->type & PCI_ADDRESS_SPACE_IO)

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

@@ -24 +24 @@
 typedef struct PCIIOREGION
 {
-    /** Current PCI mapping address.
-     * -1 means not mapped. Memory addresses are relative to pci_mem_base. */
+    /** Current PCI mapping address, 0xffffffff means not mapped. 
+        @todo: make address and size 64-bit. */
     uint32_t                        addr;
     uint32_t                        size;
@@ -73 +73 @@
 
 enum {
-    /** Set if the specific device fun was requested by PDM.
+    /** Set if the specific device function was requested by PDM.
      * If clear the device and it's functions can be relocated to satisfy the slot request of another device. */
     PCIDEV_FLAG_REQUESTED_DEVFUNC  = 1<<0,
@@ -83 +83 @@
     PCIDEV_FLAG_PCI_EXPRESS_DEVICE = 1<<2,
     /** Flag whether the device is capable of MSI.
-     * This one is set by analyzing device capabilities, or explicitly.  */
+     * This one is set by MsiInit().  */
     PCIDEV_FLAG_MSI_CAPABLE        = 1<<3,
     /** Flag whether the device is capable of MSI-X.
-     * This one is set by analyzing device capabilities.  */
+     * This one is set by MsixInit().  */
     PCIDEV_FLAG_MSIX_CAPABLE       = 1<<4
 };