Changeset 81705 in vbox

Timestamp:

Nov 6, 2019 11:58:44 AM (5 years ago)

Author:

vboxsync

Message:

PGM: Fixed getting MMIO2 mapping address mess. bugref:9218

Location:

trunk

Files:

• include/VBox/vmm/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PGMPhys.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pgm.h

@@ -732 +732 @@
 VMMR3_INT_DECL(int) PGMR3PhysMMIOExReduce(PVM pVM, PPDMDEVINS pDevIns, uint32_t iSubDev, uint32_t iRegion, PGMMMIO2HANDLE hMmio2, RTGCPHYS cbRegion);
 VMMR3_INT_DECL(int) PGMR3PhysMmio2ValidateHandle(PVM pVM, PPDMDEVINS pDevIns, PGMMMIO2HANDLE hMmio2);
-VMMR3_INT_DECL(RTGCPHYS) PGMR3PhysMMIOExGetMappingAddress(PVM pVM, PPDMDEVINS pDevIns, PGMMMIO2HANDLE hMmio2);
+VMMR3_INT_DECL(RTGCPHYS) PGMR3PhysMmio2GetMappingAddress(PVM pVM, PPDMDEVINS pDevIns, PGMMMIO2HANDLE hMmio2);
 VMMR3_INT_DECL(int) PGMR3PhysMMIOExChangeRegionNo(PVM pVM, PPDMDEVINS pDevIns, uint32_t iSubDev, uint32_t iRegion, PGMMMIO2HANDLE hMmio2, uint32_t iNewRegion);
 VMMR3DECL(bool)     PGMR3PhysMMIOExIsBase(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys);

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -691 +691 @@
     VM_ASSERT_EMT0_RETURN(pVM, NIL_RTGCPHYS);
 
-    RTGCPHYS GCPhys = PGMR3PhysMMIOExGetMappingAddress(pVM, pDevIns, hRegion);
+    RTGCPHYS GCPhys = PGMR3PhysMmio2GetMappingAddress(pVM, pDevIns, hRegion);
 
     LogFlow(("pdmR3DevHlp_Mmio2ChangeRegionNo: caller='%s'/%d: returns %RGp\n", pDevIns->pReg->szName, pDevIns->iInstance, GCPhys));

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -3856 +3856 @@
 
 /**
- * Gets the mapping address of an MMIO2 handle.
- *
- * @returns The mapping address, NIL_RTGCPHYS if not mapped of invalid input.
- * @param   pVM             The cross context VM structure.
- * @param   pVM             The cross context VM structure.
- * @param   pDevIns         The device instance owning the region.
- * @param   hMmio2          The handle of the region.
- */
-VMMR3DECL(bool) PGMR3PhysMMIO2GetMappingAddress(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys)
-{
-    /*
-     * Validate input
-     */
-    VM_ASSERT_EMT_RETURN(pVM, false);
-    AssertPtrReturn(pDevIns, false);
-    AssertReturn(GCPhys != NIL_RTGCPHYS, false);
-    AssertReturn(GCPhys != 0, false);
-    AssertReturn(!(GCPhys & PAGE_OFFSET_MASK), false);
-
-    /*
-     * Search the list.
-     */
-    pgmLock(pVM);
-    for (PPGMREGMMIO2RANGE pCurMmio = pVM->pgm.s.pRegMmioRangesR3; pCurMmio; pCurMmio = pCurMmio->pNextR3)
-        if (pCurMmio->RamRange.GCPhys == GCPhys)
-        {
-            Assert(pCurMmio->fFlags & PGMREGMMIO2RANGE_F_MAPPED);
-            bool fRet = RT_BOOL(pCurMmio->fFlags & PGMREGMMIO2RANGE_F_FIRST_CHUNK);
-            pgmUnlock(pVM);
-            return fRet;
-        }
-    pgmUnlock(pVM);
-    return false;
-}
-
-
-/**
  * Checks if the given address is an MMIO2 or pre-registered MMIO base address
  * or not.
@@ -4026 +3989 @@
 
 /**
- * Changes the region number of an MMIO2 or pre-registered MMIO region.
- *
- * This is only for dealing with save state issues, nothing else.
- *
- * @return VBox status code.
+ * Gets the mapping address of an MMIO2 region.
+ *
+ * @returns Mapping address, NIL_RTGCPHYS if not mapped or invalid handle.
  *
  * @param   pVM         The cross context VM structure.
- * @param   pDevIns     The device owning the MMIO2 memory.
- * @param   iSubDev     The sub-device number.  Pass UINT32_MAX if @a hMmio2 is
- *                      given.
- * @param   iRegion     The region.  Pass UINT32_MAX if @a hMmio2 is given.
- * @param   hMmio2      The handle of the region to map as an alternative to
- *                      @a iSubDev and @a iRegion, pass NIL to use the
- *                      other two.
- * @param   iNewRegion  The new region index.
- *
- * @thread  EMT(0)
- * @sa      @bugref{9359}
- */
-VMMR3_INT_DECL(RTGCPHYS) PGMR3PhysMMIOExGetMappingAddress(PVM pVM, PPDMDEVINS pDevIns, PGMMMIO2HANDLE hMmio2)
+ * @param   pDevIns     The device owning the MMIO2 handle.
+ * @param   hMmio2      The region handle.
+ */
+VMMR3_INT_DECL(RTGCPHYS) PGMR3PhysMmio2GetMappingAddress(PVM pVM, PPDMDEVINS pDevIns, PGMMMIO2HANDLE hMmio2)
 {
     AssertPtrReturn(pDevIns, NIL_RTGCPHYS);