Changeset 33142 in vbox

Timestamp:

Oct 14, 2010 5:25:09 PM (14 years ago)

Author:

vboxsync

Message:

PCI: new bus implementation can be used with IDE controller too

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevPciIch9.cpp (modified) (5 diffs)
• PC/DevLPC.cpp (modified) (1 diff)
• Storage/DevATA.cpp (modified) (1 diff)

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

@@ -415 +415 @@
     return VINF_SUCCESS;
 }
-
 
 static int ich9pciDataRead(PPCIGLOBALS pGlobals, uint32_t addr, int len, uint32_t *pu32)
@@ -1353 +1352 @@
 static uint32_t ich9pciConfigRead(PPCIGLOBALS pGlobals, uint8_t uBus, uint8_t uDevFn, uint32_t addr, uint32_t len)
 {
-    uint32_t u32Val;
+    uint32_t   u32Val = 0xffffffff;
     PciAddress aPciAddr;
 
@@ -1862 +1861 @@
 } PciSlotAssignments[] = {
     {
-        "piix3ide", 1, 1 // do we really need it?
-    },
-    {
         "lan",      25, 0 /* LAN controller */
     },
@@ -1873 +1869 @@
         "i82801",   30, 0 /* Host Controller */
     },
+    /**
+     *  Please note, that for devices being functions, like we do here, device 0
+     *  must be multifunction, i.e. have header type 0x80. Our LPC device is.
+     *  Alternative approach is to assign separate slot to each device.
+     */
     {
         "lpc",      31, 0 /* Low Pin Count bus */
     },
     {
+        "piix3ide", 31, 1 /* IDE controller */
+    },
+#if 0
+    {
         "ahci",     31, 2 /* SATA controller */
     },
+#endif
     {
         "smbus",    31, 3 /* System Management Bus */
@@ -1939 +1945 @@
      * Find device position
      */
-    if (iDev < 0)
+    if (iDev < 0 || !strcmp(pszName, "piix3ide"))
     {
         iDev = assignPosition(pBus, pPciDev, pszName);

trunk/src/VBox/Devices/PC/DevLPC.cpp

@@ -236 +236 @@
     PCIDevSetClassSub         (&pThis->dev, 0x01); /* PCI-to-ISA Bridge */
     PCIDevSetClassBase        (&pThis->dev, 0x06); /* Bridge */
-    PCIDevSetHeaderType       (&pThis->dev, 0x00); /* normal device */
+    PCIDevSetHeaderType       (&pThis->dev, 0x80); /* normal, multifunction device (so that other devices can be its functions) */
     PCIDevSetSubSystemVendorId(&pThis->dev, 0x8086);
     PCIDevSetSubSystemId      (&pThis->dev, 0x7270);

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -6738 +6738 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 cannot register PCI device"));
-    AssertMsg(pThis->dev.devfn == 9 || iInstance != 0, ("pThis->dev.devfn=%d\n", pThis->dev.devfn));
+    //AssertMsg(pThis->dev.devfn == 9 || iInstance != 0, ("pThis->dev.devfn=%d\n", pThis->dev.devfn));
     rc = PDMDevHlpPCIIORegionRegister(pDevIns, 4, 0x10, PCI_ADDRESS_SPACE_IO, ataBMDMAIORangeMap);
     if (RT_FAILURE(rc))