Changeset 65594 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 2, 2017 5:19:11 PM (8 years ago)

Author:

vboxsync

Message:

ACPI: properly determine PciPref64 for bigger RAM sizes; that window will now always end at 16TB-1 and only MIN+LEN is calculated dynamically

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (1 diff)
• vbox.dsl (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -3136 +3136 @@
     const uint64_t offRamHole = _4G - cbRamHole;
     if (pThis->fPciPref64Enabled)
-        pThis->u64PciPref64 = pThis->u64RamSize  < _4G ? _4G : RT_ALIGN_64(pThis->u64RamSize, _1G); /* MEM4 */
+    {
+        /* Activate MEM4 */
+        if (offRamHole >= pThis->u64RamSize)
+            pThis->u64PciPref64 = _4G;
+        else
+            pThis->u64PciPref64 = RT_ALIGN_64(pThis->u64RamSize + offRamHole, _1G);
+    }
     uint64_t cbRamLow = offRamHole < pThis->u64RamSize ? offRamHole : pThis->u64RamSize;
     if (cbRamLow > UINT32_C(0xffe00000)) /* See MEM3. */

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -1577 +1577 @@
                     ReadWrite,
                     0x0000000000000000,       // _GRA: Granularity.
-                    0x0000000100000000,       // _MIN: Min address, 4GB, will be overwritten.
-                    0x00000080ffffffff,       // _MAX: Max possible address, will be overwritten.
+                    0x0000000100000000,       // _MIN: Min address, def. 4GB, will be overwritten.
+                    0x00000fffffffffff,       // _MAX: Max possible address, 16TB-1, fixed.
                     0x0000000000000000,       // _TRA: Translation
-                    0x0000008000000000,       // _LEN: Range length (def. 512G, calculated dynamically)
+                    0x00000fff00000000,       // _LEN: Range length (calculated from _MIN)
                     ,                         // ResourceSourceIndex: Optional field left blank
                     ,                         // ResourceSource:      Optional field left blank
@@ -1601 +1601 @@
                     CreateQwordField (TOM, \_SB.PCI0.MEM4._LEN, TM4L)
 
-                    Store (0x10000000, Local1)           // 16TB in units of 64KB
                     Multiply (PMEM, 0x10000, TM4N)       // PMEM in units of 64KB
-                    Multiply (Local1, 0x10000, TM4L)
-                    Subtract (Add (TM4N, TM4L), 1, TM4X) // MAX = MIN + LEN - 1
+                    Add (Subtract (TM4X, TM4N), 1, TM4L) // determine LEN, MAX is already there
 
                     ConcatenateResTemplate (CRS, TOM, Local2)