Changeset 33606 in vbox

Timestamp:

Oct 29, 2010 1:46:48 PM (14 years ago)

Author:

vboxsync

Message:

PCI: add 2 bridges into ICH-9 chipset, more verbose topology printing

Location:

trunk/src/VBox

Files:

• Devices/Bus/DevPciIch9.cpp (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)

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

@@ -2020 +2020 @@
         return true;
 
+    int iStartPos = 0;
+
+    /* We add bridges starting slot 22 */
+    if (!strcmp(pszName, "ich9pcibridge"))
+    {
+        iStartPos = 22 * 8;
+    }
+
     /* Otherwise when assigning a slot, we need to make sure all its functions are available */
-    for (int iPos = 0; iPos < (int)RT_ELEMENTS(pBus->apDevices); iPos += 8)
+    for (int iPos = iStartPos; iPos < (int)RT_ELEMENTS(pBus->apDevices); iPos += 8)
     {
         if (        !pBus->apDevices[iPos]
@@ -2139 +2147 @@
 }
 
+static void printIndent(PCDBGFINFOHLP pHlp, int iIndent)
+{
+    for (int i = 0; i < iIndent; i++)
+    {
+        pHlp->pfnPrintf(pHlp, "    ");
+    }
+}
+
+static void ich9pciBusInfo(PPCIBUS pBus, PCDBGFINFOHLP pHlp, int iIndent)
+{
+    for (uint32_t iDev = 0; iDev < RT_ELEMENTS(pBus->apDevices); iDev++)
+    {
+        PPCIDEVICE pPciDev = pBus->apDevices[iDev];
+        if (pPciDev != NULL)
+        {
+            printIndent(pHlp, iIndent);
+            pHlp->pfnPrintf(pHlp, "%02x:%02x:%02x %s: %04x-%04x%s%s\n",
+                            pBus->iBus, (iDev >> 3) & 0xff, iDev & 0x7,
+                            pPciDev->name,
+                            PCIDevGetVendorId(pPciDev), PCIDevGetDeviceId(pPciDev),
+                            PCIIsMsiCapable(pPciDev)  ? " MSI" : "",
+                            PCIIsMsixCapable(pPciDev) ? " MSI-X" : ""
+                            );
+        }
+    }
+
+    if (pBus->cBridges > 0)
+    {
+        printIndent(pHlp, iIndent);
+        pHlp->pfnPrintf(pHlp, "Registered %d bridges, subordinate buses info follows\n", pBus->cBridges);
+        for (uint32_t iBridge = 0; iBridge < pBus->cBridges; iBridge++)
+        {
+            PPCIBUS pBusSub = PDMINS_2_DATA(pBus->papBridgesR3[iBridge]->pDevIns, PPCIBUS);
+            ich9pciBusInfo(pBusSub, pHlp, iIndent + 1);
+        }
+    }
+}
 
 /**
@@ -2150 +2195 @@
 {
     PPCIBUS pBus = DEVINS_2_PCIBUS(pDevIns);
-    uint32_t iBus = 0, iDev;
-
-
-    for (iDev = 0; iDev < RT_ELEMENTS(pBus->apDevices); iDev++)
-    {
-        PPCIDEVICE pPciDev = pBus->apDevices[iDev];
-        if (pPciDev != NULL)
-            pHlp->pfnPrintf(pHlp, "%02x:%02x:%02x %s: %x-%x\n",
-                            iBus, (iDev >> 3) & 0xff, iDev & 0x7,
-                            pPciDev->name,
-                            PCIDevGetVendorId(pPciDev), PCIDevGetDeviceId(pPciDev)
-                            );
-    }
+
+    ich9pciBusInfo(pBus, pHlp, 0);
 }
 

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -870 +870 @@
         if (chipsetType == ChipsetType_ICH9)
         {
+            /* Provide MCFG info */
             InsertConfigInteger(pCfg,  "McfgBase",   u64McfgBase);
             InsertConfigInteger(pCfg,  "McfgLength", u64McfgLength);
+
+
+            /* And register 2 bridges */
+            InsertConfigNode(pDevices, "ich9pcibridge", &pDev);
+            InsertConfigNode(pDev,     "0", &pInst);
+            InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
+
+            InsertConfigNode(pDev,     "1", &pInst);
+            InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
         }
 
@@ -1309 +1319 @@
                 case StorageControllerType_LsiLogic:
                 {
+                    // InsertConfigInteger(pCtlInst, "PCIBusNo",             1);
                     InsertConfigInteger(pCtlInst, "PCIDeviceNo",          20);
                     Assert(!afPciDeviceNo[20]);