Changeset 73777 in vbox for trunk/src/VBox/Devices/Serial

Timestamp:

Aug 20, 2018 10:36:51 AM (7 years ago)

Author:

vboxsync

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

124460

Message:

Devices/Serial/UartCore.cpp: Fix character timeout indication interrupt generation. The timer callback needs to respect the ITL level and we have to start the timer in the receive FIFO fill callback when the amount characters received is below the configured ITL. Should fix I/O hangs with Windows guests.

File:

• trunk/src/VBox/Devices/Serial/UartCore.cpp (modified) (3 diffs)

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

@@ -648 +648 @@
     {
         UART_REG_SET(pThis->uRegLsr, UART_REG_LSR_DR);
+        if (pFifo->cbUsed < pFifo->cbItl)
+        {
+            pThis->fIrqCtiPending = false;
+            TMTimerSetRelative(pThis->CTX_SUFF(pTimerRcvFifoTimeout), pThis->cSymbolXferTicks * 4, NULL);
+        }
         uartIrqUpdate(pThis);
     }
@@ -1071 +1076 @@
                     UART_REG_CLR(pThis->uRegLsr, UART_REG_LSR_DR);
                 }
-                else
-                {
-                    uint64_t tsCtiFire = TMTimerGet(pThis->CTX_SUFF(pTimerRcvFifoTimeout)) + pThis->cSymbolXferTicks * 4;
-                    TMTimerSet(pThis->CTX_SUFF(pTimerRcvFifoTimeout), tsCtiFire);
-                }
+                else if (pThis->FifoRecv.cbUsed < pThis->FifoRecv.cbItl)
+                    TMTimerSetRelative(pThis->CTX_SUFF(pTimerRcvFifoTimeout), pThis->cSymbolXferTicks * 4, NULL);
                 uartIrqUpdate(pThis);
             }
@@ -1362 +1364 @@
 static DECLCALLBACK(void) uartR3RcvFifoTimeoutTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
+    LogFlowFunc(("pDevIns=%#p pTimer=%#p pvUser=%#p\n", pDevIns, pTimer, pvUser));
     RT_NOREF(pDevIns, pTimer);
     PUARTCORE pThis = (PUARTCORE)pvUser;
     PDMCritSectEnter(&pThis->CritSect, VERR_IGNORED);
-    if (pThis->FifoRecv.cbUsed)
+    if (pThis->FifoRecv.cbUsed < pThis->FifoRecv.cbItl)
     {
         pThis->fIrqCtiPending = true;