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

Timestamp:

Dec 6, 2010 1:57:56 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68554

Message:

PCI: correct reset handlers

File:

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

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

@@ -178 +178 @@
 static void ich9pciSetIrqInternal(PPCIGLOBALS pGlobals, uint8_t uDevFn, PPCIDEVICE pPciDev, int iIrq, int iLevel);
 #ifdef IN_RING3
+static void ich9pcibridgeReset(PPDMDEVINS pDevIns);
 static int ich9pciRegisterInternal(PPCIBUS pBus, int iDev, PPCIDEVICE pPciDev, const char *pszName);
 static void ich9pciUpdateMappings(PCIDevice *pDev);
@@ -2458 +2459 @@
                        VBOX_PCI_COMMAND_MASTER));
 
-    /* Bridge device has its own reset handler clearing PCI registers */
+    /* Bridge device reset handlers processed later */
     if (!PCIIsPci2PciBridge(pDev))
     {
         PCIDevSetByte(pDev, VBOX_PCI_CACHE_LINE_SIZE, 0x0);
         PCIDevSetInterruptLine(pDev, 0x0);
-    }
+    }   
     /* Clear regions too ? */
 }
@@ -2481 +2482 @@
         if (pBus->apDevices[i])
             ich9pciResetDevice(pBus->apDevices[i]);
+    }
+
+    for (uint32_t iBridge = 0; iBridge < pBus->cBridges; iBridge++)
+    {
+        if (pBus->papBridgesR3[iBridge])
+            ich9pcibridgeReset(pBus->papBridgesR3[iBridge]->pDevIns);
     }
 
@@ -2641 +2648 @@
  * @copydoc FNPDMDEVRESET
  */
-static DECLCALLBACK(void) ich9pcibridgeReset(PPDMDEVINS pDevIns)
+static void ich9pcibridgeReset(PPDMDEVINS pDevIns)
 {
     PPCIBUS pBus = PDMINS_2_DATA(pDevIns, PPCIBUS);
@@ -2762 +2769 @@
     NULL,
     /* pfnReset */
-    ich9pcibridgeReset,
+    NULL, /* Must be NULL, to make sure only bus driver handles reset */
     /* pfnSuspend */
     NULL,