Changeset 67585 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Jun 23, 2017 3:29:50 PM (8 years ago)

Author:

vboxsync

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

116341

Message:

DevEFI/DevACPI/DevPcBios: bugref:8768: necessary adaptions of the PCI memory hole according to r113565 (2MB => 32MB)

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (1 diff)
• DevPcBios.cpp (modified) (1 diff)

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

@@ -3151 +3151 @@
                    u64PciPref64Min, pThis->u64PciPref64Max-1));
     }
-    if (cbBelow4GB > UINT32_C(0xffe00000)) /* See MEM3. */
+    if (cbBelow4GB > UINT32_C(0xfe000000)) /* See MEM3. */
     {
         /* Note: This is also enforced by DevPcBios.cpp. */
-        LogRel(("ACPI: Clipping cbRamLow=%#RX64 down to 0xffe00000.\n", cbBelow4GB));
-        cbBelow4GB = UINT32_C(0xffe00000);
+        LogRel(("ACPI: Clipping cbRamLow=%#RX64 down to 0xfe000000.\n", cbBelow4GB));
+        cbBelow4GB = UINT32_C(0xfe000000);
     }
     pThis->cbRamLow = cbBelow4GB;

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

@@ -743 +743 @@
 
     /* Bochs BIOS specific? Anyway, it's the amount of memory above 16MB
-       and below 4GB (as it can only hold 4GB+16M). We have to chop off the
-       top 2MB or it conflict with what the ACPI tables return. (Should these
+       and below 4GB (as it can only hold 4GB-16M). We have to chop off the
+       top 32MB or it conflict with what the ACPI tables return. (Should these
        be adjusted, we still have to chop it at 0xfffc0000 or it'll conflict
        with the high BIOS mapping.) */
     if (cbRamSize > 16 * _1M)
-        u32 = (RT_MIN(cbBelow4GB, UINT32_C(0xffe00000)) - 16U * _1M) / _64K;
+        u32 = (RT_MIN(cbBelow4GB, UINT32_C(0xfe000000)) - 16U * _1M) / _64K;
     else
         u32 = 0;