Changeset 33687 in vbox

Timestamp:

Nov 2, 2010 1:05:01 PM (14 years ago)

Author:

vboxsync

Message:

PCI: part 1 of PCI slots assignment logic in Main

Location:

trunk/src/VBox

Files:

• Devices/Bus/DevPciIch9.cpp (modified) (9 diffs)
• Main/BusAssignmentManager.cpp (added)
• Main/ConsoleImpl2.cpp (modified) (18 diffs)
• Main/Makefile.kmk (modified) (1 diff)
• Main/include/BusAssignmentManager.h (added)

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

@@ -253 +253 @@
     {
         PPCIGLOBALS pThis = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
+
         PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_WRITE);
         pThis->uConfigReg = u32 & ~3; /* Bits 0-1 are reserved and we silently clear them */
         PCI_UNLOCK(pDevIns);
     }
+
     return VINF_SUCCESS;
 }
@@ -311 +313 @@
                 pBridgeDevice->Int.s.pfnBridgeConfigWrite(pBridgeDevice->pDevIns, pAddr->iBus, pAddr->iDeviceFunc, pAddr->iRegister, val, cb);
             }
+            else
+            {
+                // do nothing, bridge not found
+            }
 #else
             rc = rcReschedule;
@@ -360 +366 @@
 static void ich9pciNoMem(void* ptr, int cb)
 {
-    memset(ptr, 0xff, cb);
+    for (int i = 0; i < cb; i++)
+        ((uint8_t*)ptr)[i] = 0xff;
 }
 
@@ -448 +455 @@
 }
 
-static int ich9pciDataRead(PPCIGLOBALS pGlobals, uint32_t addr, int len, uint32_t *pu32)
+static int ich9pciDataRead(PPCIGLOBALS pGlobals, uint32_t addr, int cb, uint32_t *pu32)
 {
     PciAddress aPciAddr;
 
-    LogFlow(("ich9pciDataRead: config=%x len=%d\n",  pGlobals->uConfigReg, len));
+    LogFlow(("ich9pciDataRead: config=%x cb=%d\n",  pGlobals->uConfigReg, cb));
+
+    *pu32 = 0xffffffff;
 
     if (!(pGlobals->uConfigReg & (1 << 31)))
@@ -463 +472 @@
     ich9pciStateToPciAddr(pGlobals, addr, &aPciAddr);
 
-    return ich9pciDataReadAddr(pGlobals, &aPciAddr, len, pu32, VINF_IOM_HC_IOPORT_READ);
+    return ich9pciDataReadAddr(pGlobals, &aPciAddr, cb, pu32, VINF_IOM_HC_IOPORT_READ);
 }
 
@@ -1038 +1047 @@
         }
         else
-            ich9pciNoMem(&u32Value, cb);
+            ich9pciNoMem(&u32Value, 4);
     }
     else
@@ -1050 +1059 @@
         }
         else
-            ich9pciNoMem(&u32Value, cb);
+            ich9pciNoMem(&u32Value, 4);
     }
 
@@ -1979 +1988 @@
     },
     /* Disable, if we may wish to have multiple AHCI controllers */
-#if 1
     {
         "ahci",     31, 2 /* SATA controller */
     },
-#endif
     {
         "smbus",    31, 3 /* System Management Bus */
@@ -2021 +2028 @@
 
     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 */

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -108 +108 @@
 
 #include "DHCPServerRunner.h"
+#include "BusAssignmentManager.h"
 
 #if defined(RT_OS_DARWIN)
@@ -467 +468 @@
 {
     LogFlowFuncEnter();
-    /* Note: hardcoded assumption about number of slots; see rom bios */
-    bool afPciDeviceNo[32] = {false};
+    PciBusAddress         PciAddr;
     bool fFdcEnabled = false;
     BOOL fIs64BitGuest = false;
@@ -547 +547 @@
         u64McfgBase = _4G - cbRamHole;
     }
+
+    ComPtr<BusAssignmentManager> BusMgr =
+            BusAssignmentManager::getInstance(chipsetType);
 
     ULONG cCpus = 1;
@@ -879 +882 @@
             InsertConfigNode(pDev,     "0", &pInst);
             InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
+            PciAddr = PciBusAddress(0, 24, 0);
+            hrc = BusMgr->assignPciDevice("ich9pcibridge", pInst, PciAddr);                               H();
 
             InsertConfigNode(pDev,     "1", &pInst);
             InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
+            PciAddr = PciBusAddress(0, 25, 0);
+            hrc = BusMgr->assignPciDevice("ich9pcibridge", pInst, PciAddr);                               H();
         }
 
@@ -1049 +1056 @@
         InsertConfigNode(pDev,     "0", &pInst);
         InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-        InsertConfigInteger(pInst, "PCIDeviceNo",          2);
-        Assert(!afPciDeviceNo[2]);
-        afPciDeviceNo[2] = true;
-        InsertConfigInteger(pInst, "PCIFunctionNo",        0);
+
+        PciAddr = PciBusAddress(0, 2, 0);
+        hrc = BusMgr->assignPciDevice("vga", pInst, PciAddr);                               H();
         InsertConfigNode(pInst,    "Config", &pCfg);
         ULONG cVRamMBs;
@@ -1319 +1325 @@
                 case StorageControllerType_LsiLogic:
                 {
-                    // InsertConfigInteger(pCtlInst, "PCIBusNo",             1);
-                    InsertConfigInteger(pCtlInst, "PCIDeviceNo",          20);
-                    Assert(!afPciDeviceNo[20]);
-                    afPciDeviceNo[20] = true;
-                    InsertConfigInteger(pCtlInst, "PCIFunctionNo",        0);
+                    PciAddr = PciBusAddress(1, 20, 0);
+                    hrc = BusMgr->assignPciDevice("lsilogic", pCtlInst, PciAddr);                               H();
+
 
                     /* Attach the status driver */
@@ -1339 +1343 @@
                 case StorageControllerType_BusLogic:
                 {
-                    InsertConfigInteger(pCtlInst, "PCIDeviceNo",          21);
-                    Assert(!afPciDeviceNo[21]);
-                    afPciDeviceNo[21] = true;
-                    InsertConfigInteger(pCtlInst, "PCIFunctionNo",        0);
+                    PciAddr = PciBusAddress(0, 21, 0);
+                    hrc = BusMgr->assignPciDevice("buslogic", pCtlInst, PciAddr);                               H();
 
                     /* Attach the status driver */
@@ -1358 +1360 @@
                 case StorageControllerType_IntelAhci:
                 {
-                    InsertConfigInteger(pCtlInst, "PCIDeviceNo",          13);
-                    Assert(!afPciDeviceNo[13]);
-                    afPciDeviceNo[13] = true;
-                    InsertConfigInteger(pCtlInst, "PCIFunctionNo",        0);
+                    PciAddr = PciBusAddress(0, 13, 0);
+                    hrc = BusMgr->assignPciDevice("ahci", pCtlInst, PciAddr);                               H();
 
                     ULONG cPorts = 0;
@@ -1406 +1406 @@
                      * IDE (update this when the main interface changes)
                      */
-                    InsertConfigInteger(pCtlInst, "PCIDeviceNo",          1);
-                    Assert(!afPciDeviceNo[1]);
-                    afPciDeviceNo[1] = true;
-                    InsertConfigInteger(pCtlInst, "PCIFunctionNo",        1);
+                    PciAddr = PciBusAddress(0, 1, 1);
+                    hrc = BusMgr->assignPciDevice("ide", pCtlInst, PciAddr);                               H();
                     InsertConfigString(pCfg,   "Type", controllerString(enmCtrlType));
 
@@ -1454 +1452 @@
                 case StorageControllerType_LsiLogicSas:
                 {
-                    InsertConfigInteger(pCtlInst, "PCIDeviceNo",          22);
-                    Assert(!afPciDeviceNo[22]);
-                    afPciDeviceNo[22] = true;
-                    InsertConfigInteger(pCtlInst, "PCIFunctionNo",        0);
+                    PciAddr = PciBusAddress(0, 22, 0);
+                    hrc = BusMgr->assignPciDevice("lsilogicsas", pCtlInst, PciAddr);                               H();
 
                     InsertConfigString(pCfg,  "ControllerType", "SAS1068");
@@ -1591 +1587 @@
                 iPciDeviceNo = 3;
 #endif
-            InsertConfigInteger(pInst, "PCIDeviceNo", iPciDeviceNo);
-            Assert(!afPciDeviceNo[iPciDeviceNo]);
-            afPciDeviceNo[iPciDeviceNo] = true;
-            InsertConfigInteger(pInst, "PCIFunctionNo",        0);
+            PciAddr = PciBusAddress(0, iPciDeviceNo, 0);
+            hrc = BusMgr->assignPciDevice(pszAdapterName, pInst, PciAddr);                               H();
+
             InsertConfigNode(pInst, "Config", &pCfg);
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE   /* not safe here yet. */
@@ -1819 +1814 @@
         InsertConfigNode(pInst,    "Config", &pCfg);
         InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-        InsertConfigInteger(pInst, "PCIDeviceNo",          4);
-        Assert(!afPciDeviceNo[4]);
-        afPciDeviceNo[4] = true;
-        InsertConfigInteger(pInst, "PCIFunctionNo",        0);
+        PciAddr = PciBusAddress(0, 4, 0);
+        hrc = BusMgr->assignPciDevice("VMMDev", pInst, PciAddr);                               H();
+
         Bstr hwVersion;
         hrc = pMachine->COMGETTER(HardwareVersion)(hwVersion.asOutParam());                 H();
@@ -1883 +1877 @@
                     InsertConfigNode(pDev,     "0", &pInst);
                     InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
-                    InsertConfigInteger(pInst, "PCIDeviceNo",      5);
-                    Assert(!afPciDeviceNo[5]);
-                    afPciDeviceNo[5] = true;
-                    InsertConfigInteger(pInst, "PCIFunctionNo",    0);
+                    PciAddr = PciBusAddress(0, 5, 0);
+                    hrc = BusMgr->assignPciDevice("ichac97", pInst, PciAddr);                               H();
                     InsertConfigNode(pInst,    "Config", &pCfg);
                     break;
@@ -1910 +1902 @@
                     InsertConfigNode(pDev,     "0", &pInst);
                     InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
-                    InsertConfigInteger(pInst, "PCIDeviceNo",      5);
-                    Assert(!afPciDeviceNo[5]);
-                    afPciDeviceNo[5] = true;
-                    InsertConfigInteger(pInst, "PCIFunctionNo",    0);
+                    PciAddr = PciBusAddress(0, 5, 0);
+                    hrc = BusMgr->assignPciDevice("hda", pInst, PciAddr);                               H();
                     InsertConfigNode(pInst,    "Config", &pCfg);
                 }
@@ -2012 +2002 @@
                 InsertConfigNode(pInst,    "Config", &pCfg);
                 InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-                InsertConfigInteger(pInst, "PCIDeviceNo",          6);
-                Assert(!afPciDeviceNo[6]);
-                afPciDeviceNo[6] = true;
-                InsertConfigInteger(pInst, "PCIFunctionNo",        0);
-
+                PciAddr = PciBusAddress(0, 6, 0);
+                hrc = BusMgr->assignPciDevice("usb-ohci", pInst, PciAddr);                               H();
                 InsertConfigNode(pInst,    "LUN#0", &pLunL0);
                 InsertConfigString(pLunL0, "Driver",               "VUSBRootHub");
@@ -2040 +2027 @@
                     InsertConfigNode(pInst,    "Config", &pCfg);
                     InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-                    InsertConfigInteger(pInst, "PCIDeviceNo",          11);
-                    Assert(!afPciDeviceNo[11]);
-                    afPciDeviceNo[11] = true;
-                    InsertConfigInteger(pInst, "PCIFunctionNo",        0);
+                    PciAddr = PciBusAddress(0, 11, 0);
+                    hrc = BusMgr->assignPciDevice("usb-ohci", pInst, PciAddr);                               H();
 
                     InsertConfigNode(pInst,    "LUN#0", &pLunL0);
@@ -2302 +2287 @@
             InsertConfigInteger(pInst, "Trusted", 1); /* boolean */
             InsertConfigNode(pInst,    "Config", &pCfg);
+            PciAddr = PciBusAddress(0, 7, 0);
+            hrc = BusMgr->assignPciDevice("acpi", pInst, PciAddr);                               H();
+
             InsertConfigInteger(pCfg,  "RamSize",          cbRam);
             InsertConfigInteger(pCfg,  "RamHoleSize",      cbRamHole);
@@ -2332 +2320 @@
             InsertConfigInteger(pCfg,  "ShowCpu", fShowCpu);
             InsertConfigInteger(pCfg,  "CpuHotPlug", fCpuHotPlug);
-            InsertConfigInteger(pInst, "PCIDeviceNo",          7);
-            Assert(!afPciDeviceNo[7]);
-            afPciDeviceNo[7] = true;
-            InsertConfigInteger(pInst, "PCIFunctionNo",        0);
 
             InsertConfigNode(pInst,    "LUN#0", &pLunL0);

trunk/src/VBox/Main/Makefile.kmk

@@ -636 +636 @@
         VMMDevInterface.cpp \
         EventImpl.cpp \
+        BusAssignmentManager.cpp \
         $(VBOX_AUTOGEN_EVENT_CPP) \
         $(VBOX_XML_SCHEMADEFS_CPP) \