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

Timestamp:

Feb 26, 2011 9:07:51 PM (14 years ago)

Author:

vboxsync

Message:

PCI: simplified BIOS init, fixed routing for nontrivial topologies

File:

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

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

@@ -96 +96 @@
     PCIBUS              aPciBus;
 
-
     /** I/O APIC irq levels */
     volatile uint32_t   uaPciApicIrqLevels[PCI_APIC_IRQ_PINS];
@@ -183 +182 @@
 static DECLCALLBACK(uint32_t) ich9pciConfigReadDev(PCIDevice *aDev, uint32_t u32Address, unsigned len);
 DECLINLINE(PPCIDEVICE) ich9pciFindBridge(PPCIBUS pBus, uint8_t iBus);
-static void ich9pciBiosInitDevice(PPCIGLOBALS pGlobals, uint8_t uBus, uint8_t uDevFn, uint8_t cBridgeDepth, uint8_t *paBridgePositions);
+static void ich9pciBiosInitDevice(PPCIGLOBALS pGlobals, uint8_t uBus, uint8_t uDevFn);
 #endif
 
@@ -697 +696 @@
          * If the target bus is in the range we pass the request on to the bridge.
          */
-        PPCIDEVICE pBridgeTemp = pBus->papBridgesR3[iBridge];
-        AssertMsg(pBridgeTemp && pciDevIsPci2PciBridge(pBridgeTemp),
+        PPCIDEVICE pBridge = pBus->papBridgesR3[iBridge];
+        AssertMsg(pBridge && pciDevIsPci2PciBridge(pBridge),
                   ("Device is not a PCI bridge but on the list of PCI bridges\n"));
-
-        if (   iBus >= PCIDevGetByte(pBridgeTemp, VBOX_PCI_SECONDARY_BUS)
-            && iBus <= PCIDevGetByte(pBridgeTemp, VBOX_PCI_SUBORDINATE_BUS))
-            return pBridgeTemp;
+        uint32_t uSecondary   = PCIDevGetByte(pBridge, VBOX_PCI_SECONDARY_BUS);
+        uint32_t uSubordinate = PCIDevGetByte(pBridge, VBOX_PCI_SUBORDINATE_BUS);
+        Log2(("ich9pciFindBridge on bus %p, bridge %d: %d in %d..%d\n", pBus, iBridge, iBus, uSecondary, uSubordinate));
+        if (iBus >= uSecondary && iBus <= uSubordinate)
+            return pBridge;
     }
 
@@ -1529 +1529 @@
 
 
-static void ich9pciBiosInitBridge(PPCIGLOBALS pGlobals, uint8_t uBus, uint8_t uDevFn, uint8_t cBridgeDepth, uint8_t *paBridgePositions)
-{
-    ich9pciConfigWrite(pGlobals, uBus, uDevFn, VBOX_PCI_SECONDARY_BUS, pGlobals->uBus, 1);
-    /* Temporary until we know how many other bridges are behind this one. */
-    ich9pciConfigWrite(pGlobals, uBus, uDevFn, VBOX_PCI_SUBORDINATE_BUS, 0xff, 1);
-
-    /* Add position of this bridge into the array. */
-    paBridgePositions[cBridgeDepth+1] = (uDevFn >> 3);
+static void ich9pciBiosInitBridge(PPCIGLOBALS pGlobals, uint8_t uBus, uint8_t uDevFn)
+{
+    Log(("BIOS init device: %0x2::%02x.%d\n", uBus, uDevFn >> 3, uDevFn & 7));
 
     /*
@@ -1564 +1559 @@
     /* Init devices behind the bridge and possibly other bridges as well. */
     for (int iDev = 0; iDev <= 255; iDev++)
-        ich9pciBiosInitDevice(pGlobals, uBus + 1, iDev, cBridgeDepth + 1, paBridgePositions);
-
-    /* The number of bridges behind the this one is now available. */
-    ich9pciConfigWrite(pGlobals, uBus, uDevFn, VBOX_PCI_SUBORDINATE_BUS, pGlobals->uBus, 1);
+        ich9pciBiosInitDevice(pGlobals, uBus + 1, iDev);
 
     /*
@@ -1602 +1594 @@
 }
 
-static void ich9pciBiosInitDevice(PPCIGLOBALS pGlobals, uint8_t uBus, uint8_t uDevFn, uint8_t cBridgeDepth, uint8_t *paBridgePositions)
+static void ich9pciBiosInitDevice(PPCIGLOBALS pGlobals, uint8_t uBus, uint8_t uDevFn)
 {
     uint32_t *paddr;
@@ -1643 +1635 @@
        case 0x0604:
             /* PCI-to-PCI bridge. */
-            ich9pciConfigWrite(pGlobals, uBus, uDevFn, VBOX_PCI_PRIMARY_BUS, uBus, 1);
-
             AssertMsg(pGlobals->uBus < 255, ("Too many bridges on the bus\n"));
-            pGlobals->uBus++;
-            ich9pciBiosInitBridge(pGlobals, uBus, uDevFn, cBridgeDepth, paBridgePositions);
+            ich9pciBiosInitBridge(pGlobals, uBus, uDevFn);
             break;
         default:
@@ -1701 +1690 @@
     if (iPin != 0)
     {
-        uint8_t uBridgeDevFn = uDevFn;
         iPin--;
 
-        /* We need to go up to the host bus to see which irq this device will assert there. */
-        while (cBridgeDepth != 0)
-        {
-            /* Get the pin the device would assert on the bridge. */
-            iPin = ((uBridgeDevFn >> 3) + iPin) & 3;
-            uBridgeDevFn = paBridgePositions[cBridgeDepth];
-            cBridgeDepth--;
+        if (uBus != 0)
+        {
+            /* Find bus this device attached to. */
+            PPCIBUS pBus = &pGlobals->aPciBus;
+            while (1)
+            {
+                PPCIDEVICE pBridge = ich9pciFindBridge(pBus, uBus);
+                if (!pBridge)
+                {
+                    Assert(false);
+                    break;
+                }
+                if (uBus == PCIDevGetByte(pBridge, VBOX_PCI_SECONDARY_BUS))
+                {
+                    /* OK, found bus this device attached to. */
+                    break;
+                }
+                pBus = PDMINS_2_DATA(pBridge->pDevIns, PPCIBUS);
+            }
+
+            /* We need to go up to the host bus to see which irq pin this
+             * device will use there. See logic in ich9pcibridgeSetIrq().
+             */
+            while (pBus->iBus != 0)
+            {
+                /* Get the pin the device would assert on the bridge. */
+                iPin = ((pBus->aPciDev.devfn >> 3) + iPin) & 3;
+                pBus = pBus->aPciDev.Int.s.pBusR3;
+            };
         }
 
         int iIrq = aPciIrqs[ich9pciSlotGetPirq(uBus, uDevFn, iPin)];
+        Log(("Using pin %d and IRQ %d for device %02x:%02x.%d\n", 
+             iPin, iIrq, uBus, uDevFn>>3, uDevFn&7));
         ich9pciConfigWrite(pGlobals, uBus, uDevFn, VBOX_PCI_INTERRUPT_LINE, iIrq, 1);
     }
 }
+
+/* Initializes bridges registers used for routing. */
+static void ich9pciInitBridgeTopology(PPCIGLOBALS pGlobals, PPCIBUS pBus)
+{
+    PPCIDEVICE pBridgeDev = &pBus->aPciDev;
+    PCIDevSetByte(pBridgeDev, VBOX_PCI_PRIMARY_BUS, pGlobals->uBus);
+
+    /* For simplicity, let's start numbering PCI bridges from 0,
+     * not 1, so don't increment count on Host->PCI bridge.
+     */
+    if (strcmp(pBridgeDev->name, "i82801") != 0)
+        pGlobals->uBus++;
+
+    PCIDevSetByte(pBridgeDev, VBOX_PCI_SECONDARY_BUS, pGlobals->uBus);
+    for (uint32_t iBridge = 0; iBridge < pBus->cBridges; iBridge++)
+    {
+        PPCIDEVICE pBridge = pBus->papBridgesR3[iBridge];
+        AssertMsg(pBridge && pciDevIsPci2PciBridge(pBridge),
+                  ("Device is not a PCI bridge but on the list of PCI bridges\n"));
+        PPCIBUS pChildBus = PDMINS_2_DATA(pBridge->pDevIns, PPCIBUS);
+        ich9pciInitBridgeTopology(pGlobals, pChildBus);
+    }
+    PCIDevSetByte(pBridgeDev, VBOX_PCI_SUBORDINATE_BUS, pGlobals->uBus);
+    Log2(("ich9pciInitBridgeTopology: for bus %p: primary=%d secondary=%d subordinate=%d\n",
+          pBus,
+          PCIDevGetByte(pBridgeDev, VBOX_PCI_PRIMARY_BUS),
+          PCIDevGetByte(pBridgeDev, VBOX_PCI_SECONDARY_BUS),
+          PCIDevGetByte(pBridgeDev, VBOX_PCI_SUBORDINATE_BUS)
+          ));
+}
+
 
 static DECLCALLBACK(int) ich9pciFakePCIBIOS(PPDMDEVINS pDevIns)
@@ -1733 +1776 @@
     pGlobals->uBus = 0;
 
-    /*
+    /**
+     * Assign bridge topology, for further routing to work.
+     */
+    PPCIBUS pBus = &pGlobals->aPciBus;
+    ich9pciInitBridgeTopology(pGlobals, pBus);
+
+    /**
      * Init the devices.
      */
     for (i = 0; i < 256; i++)
     {
-        uint8_t aBridgePositions[256];
-
-        memset(aBridgePositions, 0, sizeof(aBridgePositions));
-        Log2(("PCI: Initializing device %d (%#x)\n",
-              i, 0x80000000 | (i << 8)));
-        ich9pciBiosInitDevice(pGlobals, 0, i, 0, aBridgePositions);
+        ich9pciBiosInitDevice(pGlobals, 0, i);
     }
 
@@ -2128 +2172 @@
         AssertMsg(pPciDev->Int.s.pfnBridgeConfigRead && pPciDev->Int.s.pfnBridgeConfigWrite,
                   ("device is a bridge but does not implement read/write functions\n"));
+        Log2(("Setting bridge %d on bus %p\n", pBus->cBridges, pBus));
         pBus->papBridgesR3[pBus->cBridges] = pPciDev;
         pBus->cBridges++;