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

Timestamp:

Jan 3, 2011 4:15:42 PM (14 years ago)

Author:

vboxsync

Message:

PCI: correct region clenup on reset

File:

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

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

@@ -717 +717 @@
 
 #define INVALID_PCI_ADDRESS ~0U
+
+static int  ich9pciUnmapRegion(PPCIDEVICE pDev, int iRegion)
+{
+    PCIIORegion* pRegion = &pDev->Int.s.aIORegions[iRegion];
+    int rc = VINF_SUCCESS;
+    PPCIBUS pBus = pDev->Int.s.CTX_SUFF(pBus);
+
+    Assert (pRegion->size != 0);
+
+    if (pRegion->addr != INVALID_PCI_ADDRESS)
+    {
+        if (pRegion->type & PCI_ADDRESS_SPACE_IO)
+        {
+            /* Port IO */
+            rc = PDMDevHlpIOPortDeregister(pDev->pDevIns, pRegion->addr, pRegion->size);
+            AssertRC(rc);
+        }
+        else
+        {
+            RTGCPHYS GCPhysBase = pRegion->addr;
+            if (pBus->pPciHlpR3->pfnIsMMIO2Base(pBus->pDevInsR3, pDev->pDevIns, GCPhysBase))
+            {
+                /* unmap it. */
+                rc = pRegion->map_func(pDev, iRegion, NIL_RTGCPHYS, pRegion->size, (PCIADDRESSSPACE)(pRegion->type));
+                AssertRC(rc);
+                rc = PDMDevHlpMMIO2Unmap(pDev->pDevIns, iRegion, GCPhysBase);
+            }
+            else
+                rc = PDMDevHlpMMIODeregister(pDev->pDevIns, GCPhysBase, pRegion->size);          
+        }
+    }
+
+    return rc;
+}
 
 static void ich9pciUpdateMappings(PCIDevice* pDev)
@@ -778 +812 @@
         {
             if (pRegion->addr != INVALID_PCI_ADDRESS)
-            {
-                if (pRegion->type & PCI_ADDRESS_SPACE_IO)
-                {
-                    /* Port IO */
-                    rc = PDMDevHlpIOPortDeregister(pDev->pDevIns, pRegion->addr, pRegion->size);
-                    AssertRC(rc);
-                }
-                else
-                {
-                    RTGCPHYS GCPhysBase = pRegion->addr;
-                    if (pBus->pPciHlpR3->pfnIsMMIO2Base(pBus->pDevInsR3, pDev->pDevIns, GCPhysBase))
-                    {
-                        /* unmap it. */
-                        rc = pRegion->map_func(pDev, iRegion, NIL_RTGCPHYS, pRegion->size, (PCIADDRESSSPACE)(pRegion->type));
-                        AssertRC(rc);
-                        rc = PDMDevHlpMMIO2Unmap(pDev->pDevIns, iRegion, GCPhysBase);
-                    }
-                    else
-                        rc = PDMDevHlpMMIODeregister(pDev->pDevIns, GCPhysBase, pRegion->size);
-                    AssertMsgRC(rc, ("rc=%Rrc d=%s i=%d GCPhysBase=%RGp size=%#x\n", rc, pDev->name, iRegion, GCPhysBase, pRegion->size));
-                }
-            }
+                ich9pciUnmapRegion(pDev, iRegion);
+
             pRegion->addr = uNew;
             if (pRegion->addr != INVALID_PCI_ADDRESS)
@@ -2462 +2476 @@
 static void ich9pciResetDevice(PPCIDEVICE pDev)
 {
+    PPCIBUS pBus = pDev->Int.s.CTX_SUFF(pBus);
+    int rc;
+
     /* Clear regions */
-    memset(&pDev->Int.s.aIORegions, 0, sizeof(pDev->Int.s.aIORegions));
+    for (int iRegion = 0; iRegion < PCI_NUM_REGIONS; iRegion++)
+    {
+        PCIIORegion* pRegion = &pDev->Int.s.aIORegions[iRegion];
+        if (pRegion->size == 0)
+            continue;
+
+        ich9pciUnmapRegion(pDev, iRegion);
+    }
 
     PCIDevSetCommand(pDev,