Changeset 88037 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Mar 9, 2021 9:10:52 AM (4 years ago)

Author:

vboxsync

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

143166

Message:

DevBusLogic: Track last completed command, properly clear mailbox setup on reset, validate PCI ISA I/O arguments (see bugref:5112).

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -399 +399 @@
     /** Whether the extended LUN CCB format is enabled for 32 possible logical units. */
     bool                            fExtendedLunCCBFormat;
-    bool                            fAlignment2;
+    /** Last completed command, for debugging. */
+    uint8_t                         uPrevCmd;
 
     /** Current incoming mailbox position. */
@@ -1177 +1178 @@
     pThis->regGeometry = BL_GEOM_XLATEN;
     pThis->uOperationCode = 0xff; /* No command executing. */
+    pThis->uPrevCmd = 0xff;
     pThis->iParameter = 0;
     pThis->cbCommandParametersLeft = 0;
@@ -1185 +1187 @@
     pThis->uMailboxIncomingPositionCurrent = 0;
     pThis->uAhaSigIdx = 0;
+    pThis->cMailbox = 0;
+    pThis->GCPhysAddrMailboxIncomingBase = 0;
+    pThis->GCPhysAddrMailboxOutgoingBase = 0;
 
     /* Clear any active/pending interrupts. */
@@ -1228 +1233 @@
     }
 
+    pThis->uPrevCmd = pThis->uOperationCode;
     pThis->uOperationCode = 0xff;
     pThis->iParameter = 0;
@@ -1907 +1913 @@
             pReply->JP1 = 1;    /* Closed; "Factory configured - do not alter" */
             pReply->InformationIsValid = 1;
-            pReply->IsaIOPort = pThis->uISABaseCode;
+            pReply->IsaIOPort = pThis->uISABaseCode < 6 ? pThis->uISABaseCode : 0xff;
             pReply->IRQ = PCIDevGetInterruptLine(pDevIns->apPciDevs[0]);
             pThis->cbReplyParametersLeft = sizeof(ReplyInquirePCIHostAdapterInformation);
@@ -1920 +1926 @@
         case BUSLOGICCOMMAND_MODIFY_IO_ADDRESS:
         {
+
             /* Modify the ISA-compatible I/O port base. Note that this technically
              * violates the PCI spec, as this address is not reported through PCI.
@@ -1925 +1932 @@
              */
 #ifdef IN_RING3 /* We can do this from ring-0 now, but we'd like to see the LogRel, so we keep going back to ring-3 anyway. */
-            Log(("ISA I/O for PCI (code %x)\n", pThis->aCommandBuffer[0]));
-            buslogicR3RegisterISARange(pDevIns, pThis, pThis->aCommandBuffer[0]);
+            uint8_t baseCode = pThis->aCommandBuffer[0];
+
+            Log(("ISA I/O for PCI (code %x)\n", baseCode));
             pThis->cbReplyParametersLeft = 0;
-            fSuppressIrq = true;
-            fSuppressCMDC = true;
+            if (baseCode < 8) {
+                buslogicR3RegisterISARange(pDevIns, pThis, baseCode);
+                fSuppressIrq = true;
+                fSuppressCMDC = true;
+            }
+            else
+            {
+                Log(("ISA base %#x not valid for this adapter\n", baseCode));
+                pThis->regStatus |= BL_STAT_CMDINV;
+            }
             break;
 #else
@@ -3873 +3889 @@
         pHlp->pfnPrintf(pHlp, "Current command: %02X\n", pThis->uOperationCode);
 
+    /* Print the previous command, if any. */
+    if (pThis->uPrevCmd != 0xff )
+        pHlp->pfnPrintf(pHlp, "Last completed command: %02X\n", pThis->uPrevCmd);
+
     if (fVerbose && (pThis->regStatus & BL_STAT_INREQ) == 0)
     {