Changeset 70372 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 28, 2017 10:19:33 AM (7 years ago)

Author:

vboxsync

Message:

PGM: Fixes for 256 MB VRAM in raw-mode. bugref:9084

• PGMR3MapPT: Adjusted size restrictions on what pgmR3PhysMMIOExCreate does.
• pgmR3PhysMMIOExCreate: Fixed wrong loop bound when initializing floating ram range (raw mode only).
• pgmR3PhysMMIOExCreate: Fixed wrong GC mapping address calculation for floading ram range (raw mode only).
• pgmR3PhysMMIOExCreate: Addressed review comment regarding detection of non-final chunks.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PGMMap.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (3 diffs)

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

@@ -67 +67 @@
     /*
      * Validate input.
+     * Note! The lower limit (1 MB) matches how pgmR3PhysMMIOExCreate works.
      */
     Assert(!fFlags || fFlags == PGMR3MAPPT_FLAGS_UNMAPPABLE);
-    if (cb < _2M || cb > 64 * _1M)
-    {
-        AssertMsgFailed(("Serious? cb=%d\n", cb));
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertMsgReturn(cb >= _1M && cb <= _64M, ("Seriously? cb=%d (%#x)\n", cb, cb), VERR_OUT_OF_RANGE);
+
     cb = RT_ALIGN_32(cb, _4M);
     RTGCPTR GCPtrLast = GCPtr + cb - 1;

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

@@ -2597 +2597 @@
         const size_t     cbRange = RT_OFFSETOF(PGMREGMMIORANGE, RamRange.aPages[cPagesTrackedByChunk]);
         PPGMREGMMIORANGE pNew    = NULL;
-        if (   cPagesTrackedByChunk > cPagesLeft /**< @todo r=klaus the first part of the condition is guaranteed false due to RT_MIN above */
+        if (   iChunk + 1 < cChunks
             || cbRange >= _1M)
         {
@@ -2643 +2643 @@
             else
             {
-                RTGCPTR         GCPtrChunkMap = pVM->pgm.s.GCPtrPrevRamRangeMapping - cbChunk;
+                RTGCPTR         GCPtrChunkMap = pVM->pgm.s.GCPtrPrevRamRangeMapping - RT_ALIGN_Z(cbChunk, _4M);
                 RTGCPTR const   GCPtrChunk    = GCPtrChunkMap + PAGE_SIZE;
                 rc = PGMR3MapPT(pVM, GCPtrChunkMap, (uint32_t)cbChunk, 0 /*fFlags*/, pgmR3PhysMMIOExRangeRelocate, pNew, pszDesc);
@@ -2651 +2651 @@
 
                     RTGCPTR GCPtrPage  = GCPtrChunk;
-                    for (uint32_t iPage = 0; iPage < cPagesTrackedByChunk && RT_SUCCESS(rc); iPage++, GCPtrPage += PAGE_SIZE)
+                    for (uint32_t iPage = 0; iPage < cChunkPages && RT_SUCCESS(rc); iPage++, GCPtrPage += PAGE_SIZE)
                         rc = PGMMap(pVM, GCPtrPage, paChunkPages[iPage].Phys, PAGE_SIZE, 0);
                 }