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

Timestamp:

Nov 1, 2019 8:46:49 PM (6 years ago)

Author:

vboxsync

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

134381

Message:

PDM,PGM: Added handled based MMIO2 interface. Made some adjustments to the PCI I/O region registrations. (Preps for VMMDev.) bugref:9218

File:

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

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

@@ -2543 +2543 @@
     if (pRegion->addr != INVALID_PCI_ADDRESS)
     {
-        if (pRegion->hHandle != UINT64_MAX)
+        if (   (pRegion->hHandle != UINT64_MAX)
+            || (pRegion->fFlags & PDMPCIDEV_IORGN_F_NEW_STYLE))
         {
             /*
@@ -2566 +2567 @@
                     rc = PDMDevHlpMmioUnmap(pDev->Int.s.pDevInsR3, (IOMMMIOHANDLE)pRegion->hHandle);
                     AssertRC(rc);
+                    break;
+
+                case PDMPCIDEV_IORGN_F_MMIO2_HANDLE:
+                    rc = PDMDevHlpMmio2Unmap(pDev->Int.s.pDevInsR3, (PGMMMIO2HANDLE)pRegion->hHandle);
+                    AssertRC(rc);
+                    break;
+
+                case PDMPCIDEV_IORGN_F_NO_HANDLE:
+                    Assert(pRegion->fFlags & PDMPCIDEV_IORGN_F_NEW_STYLE);
+                    Assert(pRegion->hHandle == UINT64_MAX);
                     break;
 
@@ -2747 +2758 @@
                                 rc = PDMDevHlpMmioMap(pPciDev->Int.s.pDevInsR3, (IOMMMIOHANDLE)pRegion->hHandle, uNew);
                                 AssertLogRelRC(rc);
+                                break;
+
+                            case PDMPCIDEV_IORGN_F_MMIO2_HANDLE:
+                                rc = PDMDevHlpMmio2Map(pPciDev->Int.s.pDevInsR3, (PGMMMIO2HANDLE)pRegion->hHandle, uNew);
+                                AssertRC(rc);
                                 break;