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

Timestamp:

Feb 6, 2013 3:24:36 PM (12 years ago)

Author:

vboxsync

Message:

IOM: Fixed IOMMMIO_FLAGS_WRITE_ONLY_DWORD and added IOMMMIO_FLAGS_WRITE_ONLY_DWORD_QWORD.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IOMAllMMIO.cpp (modified) (7 diffs)
• VMMR3/IOM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

@@ -78 +78 @@
  * Deals with complicated MMIO writes.
  *
- * Complicatd means unaligned or non-dword/qword align accesses depending on
+ * Complicated means unaligned or non-dword/qword sized accesses depending on
  * the MMIO region's access mode flags.
  *
@@ -98 +98 @@
     AssertReturn(cbValue != 0 && cbValue <= 16, VERR_IOM_MMIO_IPE_2);
     RTGCPHYS const GCPhysStart  = GCPhys; NOREF(GCPhysStart);
-    bool const     fReadMissing = (pRange->fFlags & IOMMMIO_FLAGS_WRITE_MODE) >= IOMMMIO_FLAGS_WRITE_DWORD_READ_MISSING;
+    bool const     fReadMissing = (pRange->fFlags & IOMMMIO_FLAGS_WRITE_MODE) == IOMMMIO_FLAGS_WRITE_DWORD_READ_MISSING
+                               || (pRange->fFlags & IOMMMIO_FLAGS_WRITE_MODE) == IOMMMIO_FLAGS_WRITE_DWORD_QWORD_READ_MISSING;
 
     /*
@@ -121 +122 @@
      * Check if we should ignore the write.
      */
-    if (pRange->fFlags & IOMMMIO_FLAGS_WRITE_ONLY_DWORD)
+    if ((pRange->fFlags & IOMMMIO_FLAGS_WRITE_MODE) == IOMMMIO_FLAGS_WRITE_ONLY_DWORD)
     {
         Assert(cbValue != 4 || (GCPhys & 3));
+        return VINF_SUCCESS;
+    }
+    if ((pRange->fFlags & IOMMMIO_FLAGS_WRITE_MODE) == IOMMMIO_FLAGS_WRITE_ONLY_DWORD_QWORD)
+    {
+        Assert((cbValue != 4 && cbValue != 8) || (GCPhys & (cbValue - 1)));
         return VINF_SUCCESS;
     }
@@ -160 +166 @@
                     /** @todo What if we've split a transfer and already read
                      * something?  Since writes generally have sideeffects we
-                     * could be kind of screwed here... */
+                     * could be kind of screwed here...
+                     *
+                     * Fix: Save the current state and resume it in ring-3. Requires EM to not go
+                     *      to REM for MMIO accesses (like may currently do). */
+
                     LogFlow(("iomMMIODoComplicatedWrite: GCPhys=%RGp GCPhysStart=%RGp cbValue=%u rc=%Rrc [read]\n", GCPhys, GCPhysStart, cbValue, rc2));
                     return rc2;
@@ -206 +216 @@
         {
             u32GivenValue <<= offAccess * 8;
-            u32GivenMask <<= offAccess * 8;
+            u32GivenMask  <<= offAccess * 8;
         }
 
@@ -226 +236 @@
                 /** @todo What if we've split a transfer and already read
                  * something?  Since reads can have sideeffects we could be
-                 * kind of screwed here... */
+                 * kind of screwed here...
+                 *
+                 * Fix: Save the current state and resume it in ring-3. Requires EM to not go
+                 *      to REM for MMIO accesses (like may currently do). */
                 LogFlow(("iomMMIODoComplicatedWrite: GCPhys=%RGp GCPhysStart=%RGp cbValue=%u rc=%Rrc [write]\n", GCPhys, GCPhysStart, cbValue, rc2));
                 return rc2;
@@ -274 +287 @@
         if (   (cb == 4 && !(GCPhysFault & 3))
             || (pRange->fFlags & IOMMMIO_FLAGS_WRITE_MODE) == IOMMMIO_FLAGS_WRITE_PASSTHRU
-            || (cb == 8 && !(GCPhysFault & 7)) )
+            || (cb == 8 && !(GCPhysFault & 7) && IOMMMIO_DOES_WRITE_MODE_ALLOW_QWORD(pRange->fFlags)) )
             rc = pRange->CTX_SUFF(pfnWriteCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser),
                                                     GCPhysFault, (void *)pvData, cb); /** @todo fix const!! */

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

@@ -1419 +1419 @@
     AssertMsgReturn(   !(fFlags & ~IOMMMIO_FLAGS_VALID_MASK)
                     && (fFlags & IOMMMIO_FLAGS_READ_MODE)  <= IOMMMIO_FLAGS_READ_DWORD_QWORD
-                    && (fFlags & IOMMMIO_FLAGS_WRITE_MODE) <= IOMMMIO_FLAGS_WRITE_ONLY_DWORD,
+                    && (fFlags & IOMMMIO_FLAGS_WRITE_MODE) <= IOMMMIO_FLAGS_WRITE_ONLY_DWORD_QWORD,
                     ("%#x\n", fFlags),
                     VERR_INVALID_PARAMETER);