Changeset 73636 in vbox for trunk/src/VBox

Timestamp:

Aug 13, 2018 1:07:26 PM (6 years ago)

Author:

vboxsync

Message:

Devices/Serial: Fix Widows guests, the THRE empty interrupt status is only returned once to the guest every time it occurs

Location:

trunk/src/VBox/Devices

Files:

• Serial/UartCore.cpp (modified) (13 diffs)
• Serial/UartCore.h (modified) (1 diff)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Serial/UartCore.cpp

@@ -69 +69 @@
 /** Sets the interrupt identification to the given value. */
 # define UART_REG_IIR_ID_SET(a_Val)          (((a_Val) << 1) & UART_REG_IIR_ID_MASK)
+/** Gets the interrupt identification from the given IIR register value. */
+# define UART_REG_IIR_ID_GET(a_Val)          (((a_Val) >> 1) & UART_REG_IIR_ID_MASK)
 /** Receiver Line Status interrupt. */
 #  define UART_REG_IIR_ID_RCL                0x3
@@ -303 +305 @@
         uRegIirNew = UART_REG_IIR_ID_SET(UART_REG_IIR_ID_RDA);
     else if (   (pThis->uRegLsr & UART_REG_LSR_THRE)
-             && (pThis->uRegIer & UART_REG_IER_ETBEI))
+             && pThis->fThreEmptyPending)
         uRegIirNew = UART_REG_IIR_ID_SET(UART_REG_IIR_ID_THRE);
     else if (   (pThis->uRegMsr & UART_REG_MSR_BITS_IIR_MS)
@@ -689 +691 @@
 {
     pThis->uRegLsr = UART_REG_LSR_THRE | UART_REG_LSR_TEMT;
+    pThis->fThreEmptyPending = false;
 
     uartFifoClear(&pThis->FifoXmit);
@@ -749 +752 @@
             uartFifoPut(&pThis->FifoXmit, true /*fOvrWr*/, uVal);
             UART_REG_CLR(pThis->uRegLsr, UART_REG_LSR_THRE | UART_REG_LSR_TEMT);
+            pThis->fThreEmptyPending = false;
             uartIrqUpdate(pThis);
             if (pThis->pDrvSerial)
@@ -768 +772 @@
                 pThis->uRegThr = uVal;
                 UART_REG_CLR(pThis->uRegLsr, UART_REG_LSR_THRE | UART_REG_LSR_TEMT);
+                pThis->fThreEmptyPending = false;
                 uartIrqUpdate(pThis);
                 if (pThis->pDrvSerial)
@@ -1116 +1121 @@
 {
     *puVal = pThis->uRegIir;
+    /* Reset the THRE empty interrupt id when this gets returned to the guest (see table 3 UART Reset configuration). */
+    if (UART_REG_IIR_ID_GET(pThis->uRegIir) == UART_REG_IIR_ID_THRE)
+    {
+        pThis->fThreEmptyPending = false;
+        uartIrqUpdate(pThis);
+    }
     return VINF_SUCCESS;
 }
@@ -1406 +1417 @@
         *pcbRead = uartFifoCopyTo(&pThis->FifoXmit, pvBuf, cbRead);
         if (!pThis->FifoXmit.cbUsed)
+        {
             UART_REG_SET(pThis->uRegLsr, UART_REG_LSR_THRE);
+            pThis->fThreEmptyPending = true;
+        }
         if (*pcbRead)
             UART_REG_CLR(pThis->uRegLsr, UART_REG_LSR_TEMT);
@@ -1417 +1431 @@
         UART_REG_SET(pThis->uRegLsr, UART_REG_LSR_THRE);
         UART_REG_CLR(pThis->uRegLsr, UART_REG_LSR_TEMT);
+        pThis->fThreEmptyPending = true;
         uartIrqUpdate(pThis);
     }
@@ -1493 +1508 @@
     SSMR3PutU8(pSSM,   pThis->uRegScr);
     SSMR3PutBool(pSSM, pThis->fIrqCtiPending);
+    SSMR3PutBool(pSSM, pThis->fThreEmptyPending);
     SSMR3PutU8(pSSM,   pThis->FifoXmit.cbMax);
     SSMR3PutU8(pSSM,   pThis->FifoXmit.cbItl);
@@ -1522 +1538 @@
         SSMR3GetU8(pSSM,   &pThis->uRegScr);
         SSMR3GetBool(pSSM, &pThis->fIrqCtiPending);
+        SSMR3GetBool(pSSM, &pThis->fThreEmptyPending);
         SSMR3GetU8(pSSM,   &pThis->FifoXmit.cbMax);
         SSMR3GetU8(pSSM,   &pThis->FifoXmit.cbItl);
@@ -1538 +1555 @@
 
         int      uIrq;
+        int32_t  iTmp;
         uint32_t PortBase;
 
@@ -1550 +1568 @@
         if (uVersion > UART_SAVED_STATE_VERSION_16450)
             SSMR3GetU8(pSSM, &pThis->uRegFcr);
-        SSMR3Skip(pSSM, sizeof(int32_t));
+        SSMR3GetS32(pSSM, &iTmp);
+        pThis->fThreEmptyPending = RT_BOOL(iTmp);
         SSMR3GetS32(pSSM, &uIrq);
         SSMR3Skip(pSSM, sizeof(int32_t));
@@ -1638 +1657 @@
     pThis->uRegScr        = 0;
     pThis->fIrqCtiPending = false;
+    pThis->fThreEmptyPending = false;
 
     /* Standard FIFO size for 15550A. */

trunk/src/VBox/Devices/Serial/UartCore.h

@@ -181 +181 @@
      * is not empty). */
     bool                            fIrqCtiPending;
+    /** Flag whether the transmitter holding register went empty since last time the
+     * IIR register was read. This gets reset when IIR is read so the guest will get this
+     * interrupt ID only once. */
+    bool                            fThreEmptyPending;
     /** Alignment. */
-    bool                            afAlignment[3];
+    bool                            afAlignment[2];
         /** The transmit FIFO. */
     UARTFIFO                        FifoXmit;

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1350 +1350 @@
     GEN_CHECK_OFF(UARTCORE, uRegScr);
     GEN_CHECK_OFF(UARTCORE, fIrqCtiPending);
+    GEN_CHECK_OFF(UARTCORE, fThreEmptyPending);
     GEN_CHECK_OFF(UARTCORE, FifoXmit);
     GEN_CHECK_OFF(UARTCORE, FifoRecv);