Changeset 63045 in vbox for trunk/src

Timestamp:

Aug 5, 2016 1:54:39 PM (9 years ago)

Author:

vboxsync

Message:

DevIoApic: bugref:8386:39 Allow writing the remote IRR bit while writing the RTE when emulating the ICH9 specification of the I/O APIC.

File:

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

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

@@ -134 +134 @@
 /** Redirection table entry - Gets the vector. */
 #define IOAPIC_RTE_GET_VECTOR(a_Reg)            ((a_Reg) & IOAPIC_RTE_VECTOR)
+
+#if IOAPIC_HARDWARE_VERSION == IOAPIC_HARDWARE_VERSION_82093AA
 /** Redirection table entry - Valid write mask. */
 #define IOAPIC_RTE_VALID_WRITE_MASK             (  IOAPIC_RTE_DEST     | IOAPIC_RTE_MASK      | IOAPIC_RTE_TRIGGER_MODE \
                                                  | IOAPIC_RTE_POLARITY | IOAPIC_RTE_DEST_MODE | IOAPIC_RTE_DELIVERY_MODE \
                                                  | IOAPIC_RTE_VECTOR)
-
-#if IOAPIC_HARDWARE_VERSION == IOAPIC_HARDWARE_VERSION_82093AA
 /** Redirection table entry - Valid read mask. */
 # define IOAPIC_RTE_VALID_READ_MASK             (  IOAPIC_RTE_DEST       | IOAPIC_RTE_MASK          | IOAPIC_RTE_TRIGGER_MODE \
@@ -145 +145 @@
                                                  | IOAPIC_RTE_DEST_MODE  | IOAPIC_RTE_DELIVERY_MODE | IOAPIC_RTE_VECTOR)
 #elif IOAPIC_HARDWARE_VERSION == IOAPIC_HARDWARE_VERSION_ICH9
-/** Redirection table entry - Valid read mask. */
+/** Redirection table entry - Valid write mask (incl. remote IRR). */
+#define IOAPIC_RTE_VALID_WRITE_MASK             (  IOAPIC_RTE_DEST       | IOAPIC_RTE_MASK      | IOAPIC_RTE_TRIGGER_MODE \
+                                                 | IOAPIC_RTE_REMOTE_IRR | IOAPIC_RTE_POLARITY  | IOAPIC_RTE_DEST_MODE \
+                                                 | IOAPIC_RTE_DELIVERY_MODE | IOAPIC_RTE_VECTOR)
+/** Redirection table entry - Valid read mask (incl. ExtDestID). */
 # define IOAPIC_RTE_VALID_READ_MASK             (  IOAPIC_RTE_DEST            | IOAPIC_RTE_EXT_DEST_ID | IOAPIC_RTE_MASK \
                                                  | IOAPIC_RTE_TRIGGER_MODE    | IOAPIC_RTE_REMOTE_IRR  | IOAPIC_RTE_POLARITY \
@@ -620 +624 @@
 
         IOAPIC_UNLOCK(pThis);
-#ifdef DEBUG_ramshankar
-        /* Seems this can trigger if the guest reprograms the I/O APIC before an EOI, see @bugref{8386#c37}. */
         AssertMsg(fRemoteIrrCleared, ("Failed to clear remote IRR for vector %#x (%u)\n", u8Vector, u8Vector));
-#endif
     }
     else