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

Timestamp:

Feb 17, 2022 5:45:10 PM (3 years ago)

Author:

vboxsync

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

150035

Message:

DevPIC: Must handle at least some 16-bit accesses. Existing software may write 16-bit EOI, causing hangs if ignored.

File:

• trunk/src/VBox/Devices/PC/DevPIC.cpp (modified) (4 diffs)

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

@@ -682 +682 @@
     PDEVPICCC   pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVPICCC);
     uint32_t    iPic    = (uint32_t)(uintptr_t)pvUser;
+    int         rc;
 
     Assert(iPic == 0 || iPic == 1);
     if (cb == 1)
     {
-        int rc;
         PIC_LOCK_RET(pDevIns, pThisCC, VINF_IOM_R3_IOPORT_READ);
         *pu32 = pic_ioport_read(pDevIns, pThis, pThisCC, &RT_SAFE_SUBSCRIPT(pThis->aPics, iPic), offPort, &rc);
@@ -692 +692 @@
         return rc;
     }
+    else if (cb == 2)
+    {
+        uint8_t     u8Lo, u8Hi = 0;
+        /* Manually split access. Probably not 100% accurate! */
+        PIC_LOCK_RET(pDevIns, pThisCC, VINF_IOM_R3_IOPORT_READ);
+        u8Lo = pic_ioport_read(pDevIns, pThis, pThisCC, &RT_SAFE_SUBSCRIPT(pThis->aPics, iPic), offPort, &rc);
+        Assert(rc == VINF_SUCCESS);
+        if (!(offPort & 1))
+            u8Hi = pic_ioport_read(pDevIns, pThis, pThisCC, &RT_SAFE_SUBSCRIPT(pThis->aPics, iPic), offPort + 1, &rc);
+        PIC_UNLOCK(pDevIns, pThisCC);
+        *pu32 = RT_MAKE_U16(u8Lo, u8Hi);
+        return rc;
+    }
     return VERR_IOM_IOPORT_UNUSED;
 }
@@ -704 +717 @@
     PDEVPICCC   pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVPICCC);
     uint32_t    iPic    = (uint32_t)(uintptr_t)pvUser;
+    VBOXSTRICTRC rc;
 
     Assert(iPic == 0 || iPic == 1);
@@ -709 +723 @@
     if (cb == 1)
     {
-        VBOXSTRICTRC rc;
         PIC_LOCK_RET(pDevIns, pThisCC, VINF_IOM_R3_IOPORT_WRITE);
         rc = pic_ioport_write(pDevIns, pThis, pThisCC, &RT_SAFE_SUBSCRIPT(pThis->aPics, iPic), offPort, u32);
+        PIC_UNLOCK(pDevIns, pThisCC);
+        return rc;
+    }
+    else if (cb == 2)
+    {
+        PIC_LOCK_RET(pDevIns, pThisCC, VINF_IOM_R3_IOPORT_WRITE);
+        /* Manually split access. Probably not 100% accurate! */
+        rc = pic_ioport_write(pDevIns, pThis, pThisCC, &RT_SAFE_SUBSCRIPT(pThis->aPics, iPic), offPort, RT_LOBYTE(u32));
+        if (RT_SUCCESS(rc) && !(offPort & 1))
+            rc = pic_ioport_write(pDevIns, pThis, pThisCC, &RT_SAFE_SUBSCRIPT(pThis->aPics, iPic), offPort + 1, RT_HIBYTE(u32));
         PIC_UNLOCK(pDevIns, pThisCC);
         return rc;