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

Timestamp:

Sep 20, 2010 12:41:48 PM (14 years ago)

Author:

vboxsync

Message:

PCI: further MCFG work

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (8 diffs)

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

@@ -103 +103 @@
     uint8_t             uBus;
 #endif
+    /* Physical address of PCI config space MMIO region */
+     uint64_t            u64PciConfigMMioAddress;
+    /* Length of PCI config space MMIO region */
+    uint64_t            u64PciConfigMMioLength;
 
 
@@ -157 +161 @@
 PDMBOTHCBDECL(int)  ich9pciIOPortDataWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
 PDMBOTHCBDECL(int)  ich9pciIOPortDataRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb);
+PDMBOTHCBDECL(int)  ich9pciMcfgMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
+PDMBOTHCBDECL(int)  ich9pciMcfgMMIORead (PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
 
 RT_C_DECLS_END
@@ -498 +504 @@
 
 #ifdef IN_RING3
+
+PDMBOTHCBDECL(int)  ich9pciMcfgMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
+{
+    //PPCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
+    Assert(false);
+    return VINF_IOM_MMIO_UNUSED_FF;
+}
+
+PDMBOTHCBDECL(int)  ich9pciMcfgMMIORead (PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
+{
+    //PPCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
+    Assert(false);
+    return VINF_IOM_MMIO_UNUSED_FF;
+}
+
 DECLINLINE(PPCIDEVICE) ich9pciFindBridge(PPCIBUS pBus, uint8_t iBus)
 {
@@ -826 +847 @@
         { VBOX_PCI_INTERRUPT_PIN, 1, 0, 3, "INTERRUPT_PIN" },     // fBridge=??
         { VBOX_PCI_MIN_GNT, 1, 0, 1, "MIN_GNT" },
-        { VBOX_PCI_BRIDGE_CONTROL, 2, 1, 2, "BRIDGE_CONTROL" },    // fWritable = !? 
+        { VBOX_PCI_BRIDGE_CONTROL, 2, 1, 2, "BRIDGE_CONTROL" },    // fWritable = !?
         { VBOX_PCI_MAX_LAT, 1, 0, 3, "MAX_LAT" },           // fBridge=!?
         /* The COMMAND register must come last as it requires the *ADDRESS*
@@ -1723 +1744 @@
      * Validate and read configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "IOAPIC\0" "GCEnabled\0" "R0Enabled\0"))
+    if (!CFGMR3AreValuesValid(pCfg, 
+                              "IOAPIC\0" 
+                              "GCEnabled\0" 
+                              "R0Enabled\0"
+                              "McfgBase\0"
+                              "McfgLength\0"
+                              ))
         return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
 
@@ -1746 +1773 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to query boolean value \"R0Enabled\""));
+
     Log(("PCI: fUseIoApic=%RTbool fGCEnabled=%RTbool fR0Enabled=%RTbool\n", fUseIoApic, fGCEnabled, fR0Enabled));
 
@@ -1759 +1787 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Must use IO-APIC with ICH9 chipset"));
+    rc = CFGMR3QueryU64Def(pCfg, "McfgBase", &pGlobals->u64PciConfigMMioAddress, 0);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"McfgBase\""));
+    rc = CFGMR3QueryU64Def(pCfg, "McfgLength", &pGlobals->u64PciConfigMMioLength, 0);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"McfgLength\""));
+
     pGlobals->pDevInsR3 = pDevIns;
     pGlobals->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
@@ -1843 +1880 @@
         if (RT_FAILURE(rc))
             return rc;
+    }
+
+    if (pGlobals->u64PciConfigMMioAddress != 0)
+    {
+        rc = PDMDevHlpMMIORegister(pDevIns, pGlobals->u64PciConfigMMioAddress, pGlobals->u64PciConfigMMioLength, pGlobals,
+                                   ich9pciMcfgMMIOWrite, ich9pciMcfgMMIORead, NULL, "MCFG ranges");
+        if (RT_FAILURE(rc))
+        {
+            AssertMsgRC(rc, ("Cannot register MCFG MMIO: %Rrc\n", rc));
+            return rc;
+        }
     }