Changeset 83299 in vbox

Timestamp:

Mar 16, 2020 3:20:30 PM (5 years ago)

Author:

vboxsync

Message:

DevPS2: Discard input when device's serial line is disabled. Also discard queued mouse input if protocol changes.

Location:

trunk/src/VBox/Devices/Input

Files:

• DevPS2.cpp (modified) (4 diffs)
• DevPS2.h (modified) (4 diffs)
• DevPS2K.cpp (modified) (2 diffs)
• DevPS2M.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -318 +318 @@
     case KBD_CCMD_MOUSE_DISABLE:
         s->mode |= KBD_MODE_DISABLE_MOUSE;
+        PS2MLineDisable(&s->Aux);
         break;
     case KBD_CCMD_MOUSE_ENABLE:
+        PS2MLineEnable(&s->Aux);
         s->mode &= ~KBD_MODE_DISABLE_MOUSE;
         /* Check for queued input. */
+        ///@todo: Can there actually be any?
         kbd_update_irq(pDevIns, s);
         break;
@@ -488 +491 @@
     case KBD_CCMD_WRITE_MOUSE:
         /* Automatically enables aux interface. */
-        s->mode &= ~KBD_MODE_DISABLE_MOUSE;
+        if (s->mode & KBD_MODE_DISABLE_MOUSE)
+        {
+            PS2MLineEnable(&s->Aux);
+            s->mode &= ~KBD_MODE_DISABLE_MOUSE;
+        }
         rc = PS2MByteToAux(pDevIns, &s->Aux, val);
         if (rc == VINF_SUCCESS)
@@ -923 +930 @@
     PKBDSTATER3  pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PKBDSTATER3);
     RT_NOREF(pSSM);
+    if (pThis->mode & KBD_MODE_DISABLE_MOUSE)
+        PS2MLineDisable(&pThis->Aux);
+    if (pThis->mode & KBD_MODE_DISABLE_KBD)
+        PS2KLineDisable(&pThis->Kbd);
     return PS2KR3LoadDone(pDevIns, &pThis->Kbd, &pThisCC->Kbd);
+}
+
+
+/**
+ * Debug device info handler. Prints basic auxiliary device state.
+ *
+ * @param   pDevIns     Device instance which registered the info.
+ * @param   pHlp        Callback functions for doing output.
+ * @param   pszArgs     Argument string. Optional and specific to the handler.
+ */
+static DECLCALLBACK(void) kbdR3InfoState(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    PKBDSTATE    pThis   = PDMDEVINS_2_DATA(pDevIns, PKBDSTATE);
+    NOREF(pszArgs);
+
+    pHlp->pfnPrintf(pHlp, "Keyboard controller: Active command %02X, DBB out %02X, translation %s\n",
+                    pThis->write_cmd, pThis->dbbout, pThis->translate ? "on"  : "off");
+
+    pHlp->pfnPrintf(pHlp, "Mode: %02X ( ", pThis->mode);
+    if (pThis->mode & KBD_MODE_DISABLE_KBD)
+        pHlp->pfnPrintf(pHlp, "DISABLE_KBD ");
+    if (pThis->mode & KBD_MODE_KBD_INT)
+        pHlp->pfnPrintf(pHlp, "KBD_INT ");
+    if (pThis->mode & KBD_MODE_MOUSE_INT)
+        pHlp->pfnPrintf(pHlp, "AUX_INT ");
+    if (pThis->mode & KBD_MODE_SYS)
+        pHlp->pfnPrintf(pHlp, "SYS ");
+    if (pThis->mode & KBD_MODE_NO_KEYLOCK)
+        pHlp->pfnPrintf(pHlp, "NO_KEYLOCK ");
+    if (pThis->mode & KBD_MODE_DISABLE_KBD)
+        pHlp->pfnPrintf(pHlp, "DISABLE_KBD ");
+    if (pThis->mode & KBD_MODE_DISABLE_MOUSE)
+        pHlp->pfnPrintf(pHlp, "DISABLE_AUX ");
+    if (pThis->mode & KBD_MODE_KCC)
+        pHlp->pfnPrintf(pHlp, "KCC ");
+    if (pThis->mode & KBD_MODE_RFU)
+        pHlp->pfnPrintf(pHlp, "RFU ");
+    pHlp->pfnPrintf(pHlp, " )\n");
+
+    pHlp->pfnPrintf(pHlp, "Status: %02X ( ", pThis->status);
+    if (pThis->status & KBD_STAT_OBF)
+        pHlp->pfnPrintf(pHlp, "OBF ");
+    if (pThis->status & KBD_STAT_IBF)
+        pHlp->pfnPrintf(pHlp, "IBF ");
+    if (pThis->status & KBD_STAT_SELFTEST)
+        pHlp->pfnPrintf(pHlp, "SELFTEST ");
+    if (pThis->status & KBD_STAT_CMD)
+        pHlp->pfnPrintf(pHlp, "CMD ");
+    if (pThis->status & KBD_STAT_UNLOCKED)
+        pHlp->pfnPrintf(pHlp, "UNLOCKED ");
+    if (pThis->status & KBD_STAT_MOUSE_OBF)
+        pHlp->pfnPrintf(pHlp, "AUX_OBF ");
+    if (pThis->status & KBD_STAT_GTO)
+        pHlp->pfnPrintf(pHlp, "GTO ");
+    if (pThis->status & KBD_STAT_PERR)
+        pHlp->pfnPrintf(pHlp, "PERR ");
+    pHlp->pfnPrintf(pHlp, " )\n");
 }
 
@@ -1069 +1137 @@
                                 NULL, kbdR3LoadExec, kbdR3LoadDone);
     AssertRCReturn(rc, rc);
+
+    /*
+     * Register debugger info callbacks.
+     */
+    PDMDevHlpDBGFInfoRegister(pDevIns, "ps2c", "Display keyboard/mouse controller state.", kbdR3InfoState);
 
     /*

trunk/src/VBox/Devices/Input/DevPS2.h

@@ -149 +149 @@
     /** Set if the input rate should be throttled. */
     bool                fThrottleEnabled;
-    uint8_t             abAlignment2[2];
+    /** Set if the serial line is disabled on the KBC. */
+    bool                fLineDisabled;
+    uint8_t             abAlignment2[1];
 
     /** Command delay timer. */
@@ -197 +199 @@
 int  PS2KByteFromKbd(PPDMDEVINS pDevIns, PPS2K pThis, uint8_t *pVal);
 
+void PS2KLineDisable(PPS2K pThis);
+void PS2KLineEnable(PPS2K pThis);
+
 int  PS2KR3Construct(PPDMDEVINS pDevIns, PPS2K pThis, PPS2KR3 pThisCC, PCFGMNODE pCfg);
 int  PS2KR3Attach(PPDMDEVINS pDevIns, PPS2KR3 pThisCC, unsigned iLUN, uint32_t fFlags);
@@ -268 +273 @@
     /** Currently processed command (if any). */
     uint8_t             u8CurrCmd;
+    /** Set if the serial line is disabled on the KBC. */
+    bool                fLineDisabled;
     /** Set if the throttle delay is active. */
     bool                fThrottleActive;
@@ -341 +348 @@
 int  PS2MByteFromAux(PPS2M pThis, uint8_t *pVal);
 
+void PS2MLineDisable(PPS2M pThis);
+void PS2MLineEnable(PPS2M pThis);
+
 int  PS2MR3Construct(PPDMDEVINS pDevIns, PPS2M pThis, PPS2MR3 pThisCC);
 int  PS2MR3Attach(PPDMDEVINS pDevIns, PPS2MR3 pThisCC, unsigned iLUN, uint32_t fFlags);

trunk/src/VBox/Devices/Input/DevPS2K.cpp

@@ -483 +483 @@
 
 /**
+ * The keyboard controller disabled the keyboard serial line.
+ *
+ * @param   pDevIns The device instance.
+ * @param   pThis   The PS/2 auxiliary device shared instance data.
+ */
+void PS2KLineDisable(PPS2K pThis)
+{
+    pThis->fLineDisabled = true;
+}
+
+/**
+ * The keyboard controller enabled the keyboard serial line.
+ *
+ * @param   pDevIns The device instance.
+ * @param   pThis   The PS/2 auxiliary device shared instance data.
+ */
+void PS2KLineEnable(PPS2K pThis)
+{
+    pThis->fLineDisabled = false;
+
+    /* If there was anything in the input queue,
+     * consider it lost and throw it away.
+     */
+    PS2Q_CLEAR(&pThis->keyQ);
+}
+
+/**
  * Receive and process a byte sent by the keyboard controller.
  *
@@ -1031 +1058 @@
     NOREF(pszArgs);
 
-    pHlp->pfnPrintf(pHlp, "PS/2 Keyboard: scan set %d, scanning %s\n",
-                    pThis->u8ScanSet, pThis->fScanning ? "enabled" : "disabled");
+    pHlp->pfnPrintf(pHlp, "PS/2 Keyboard: scan set %d, scanning %s, serial line %s\n",
+                    pThis->u8ScanSet, pThis->fScanning ? "enabled" : "disabled",
+                    pThis->fLineDisabled ? "disabled" : "enabled");
     pHlp->pfnPrintf(pHlp, "Active command %02X\n", pThis->u8CurrCmd);
     pHlp->pfnPrintf(pHlp, "LED state %02X, Num Lock %s\n", pThis->u8LEDs,

trunk/src/VBox/Devices/Input/DevPS2M.cpp

@@ -257 +257 @@
 static void ps2mRateProtocolKnock(PPS2M pThis, uint8_t rate)
 {
+    PS2M_PROTO          enmOldProtocol = pThis->enmProtocol;
+
     switch (pThis->enmKnockState)
     {
@@ -299 +301 @@
         pThis->enmKnockState = PS2M_KNOCK_INITIAL;
     }
+
+    /* If the protocol changed, throw away any queued input because it now
+     * has the wrong format, which could severely confuse the guest.
+     */
+    if (enmOldProtocol != pThis->enmProtocol)
+        PS2Q_CLEAR(&pThis->evtQ);
 }
 
@@ -411 +419 @@
    return fValid;
 }
+
+
+/**
+ * The keyboard controller disabled the auxiliary serial line.
+ *
+ * @param   pDevIns The device instance.
+ * @param   pThis   The PS/2 auxiliary device shared instance data.
+ */
+void PS2MLineDisable(PPS2M pThis)
+{
+    pThis->fLineDisabled = true;
+}
+
+/**
+ * The keyboard controller enabled the auxiliary serial line.
+ *
+ * @param   pDevIns The device instance.
+ * @param   pThis   The PS/2 auxiliary device shared instance data.
+ */
+void PS2MLineEnable(PPS2M pThis)
+{
+    pThis->fLineDisabled = false;
+
+    /* If there was anything in the input queue,
+     * consider it lost and throw it away.
+     */
+    PS2Q_CLEAR(&pThis->evtQ);
+}
+
 
 /**
@@ -743 +780 @@
 
     Assert(pThis->enmMode < RT_ELEMENTS(s_apcszModes));
-    pHlp->pfnPrintf(pHlp, "PS/2 mouse state: %s, %s mode, reporting %s\n",
+    pHlp->pfnPrintf(pHlp, "PS/2 mouse state: %s, %s mode, reporting %s, serial line %s\n",
                     s_apcszModes[pThis->enmMode],
                     pThis->u8State & AUX_STATE_REMOTE  ? "remote"  : "stream",
-                    pThis->u8State & AUX_STATE_ENABLED ? "enabled" : "disabled");
+                    pThis->u8State & AUX_STATE_ENABLED ? "enabled" : "disabled",
+                    pThis->fLineDisabled ? "disabled" : "enabled");
     Assert(pThis->enmProtocol < RT_ELEMENTS(s_apcszProtocols));
     pHlp->pfnPrintf(pHlp, "Protocol: %s, scaling %u:1\n",