Changeset 70740 in vbox

Timestamp:

Jan 25, 2018 2:13:56 PM (7 years ago)

Author:

vboxsync

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

120499

Message:

DevPcArch.cpp: Make RAM in the range 0xa0000 and 0xfffff be reserved, making emm386 happy.

File:

• trunk/src/VBox/Devices/PC/DevPcArch.cpp (modified) (3 diffs)

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

@@ -23 +23 @@
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/vmm/mm.h>
+#include <VBox/vmm/pgm.h>
 #include <VBox/log.h>
 #include <VBox/err.h>
@@ -186 +187 @@
 
 /**
+ * @callback_method_impl{FNIOMMMIOWRITE, Ignores writes to the reserved memory.}
+ */
+static DECLCALLBACK(int) pcarchReservedMemoryWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr,
+                                                   void const *pv, unsigned cb)
+{
+    Log2(("pcarchReservedMemoryRead: %#RGp LB %#x %.*Rhxs\n", GCPhysAddr, cb, RT_MIN(cb, 16), pv));
+    NOREF(pDevIns); NOREF(pvUser); NOREF(GCPhysAddr); NOREF(pv); NOREF(cb);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @callback_method_impl{FNIOMMMIOREAD, The reserved memory reads as 0xff.}
+ */
+static DECLCALLBACK(int) pcarchReservedMemoryRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
+{
+    Log2(("pcarchReservedMemoryRead: %#RGp LB %#x\n", GCPhysAddr, cb));
+    NOREF(pDevIns); NOREF(pvUser); NOREF(GCPhysAddr);
+    memset(pv, 0xff, cb);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @interface_method_impl{PDMDEVREG,pfnInitComplete,
+ *      Turn RAM pages between 0xa0000 and 0xfffff into reserved memory.}
+ */
+static DECLCALLBACK(int) pcarchInitComplete(PPDMDEVINS pDevIns)
+{
+    PVM             pVM       = PDMDevHlpGetVM(pDevIns);
+    int             iRegion   = 0;
+    RTGCPHYS const  GCPhysEnd = 0x100000;
+    RTGCPHYS        GCPhysCur = 0x0a0000;
+    do
+    {
+        if (!PGMPhysIsGCPhysNormal(pVM, GCPhysCur))
+            GCPhysCur += X86_PAGE_SIZE;
+        else
+        {
+            RTGCPHYS const GCPhysStart = GCPhysCur;
+            do
+                GCPhysCur += X86_PAGE_SIZE;
+            while (GCPhysCur < GCPhysEnd && PGMPhysIsGCPhysNormal(pVM, GCPhysCur));
+
+            int rc = PDMDevHlpMMIORegister(pDevIns, GCPhysStart, GCPhysCur - GCPhysStart, NULL /*pvUser*/,
+                                           IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU,
+                                           pcarchReservedMemoryWrite, pcarchReservedMemoryRead,
+                                           MMR3HeapAPrintf(pVM, MM_TAG_PGM_PHYS /* bad bird*/, "PC Arch Reserved #%u", iRegion));
+            AssertLogRelRCReturn(rc, rc);
+        }
+    } while (GCPhysCur < GCPhysEnd);
+
+    return VINF_SUCCESS;
+}
+
+
+/**
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
@@ -271 +329 @@
     NULL,
     /* pfnInitComplete. */
-    NULL,
+    pcarchInitComplete,
     /* pfnPowerOff */
     NULL,