Changeset 28684 in vbox

Timestamp:

Apr 24, 2010 2:22:22 PM (15 years ago)

Author:

vboxsync

Message:

VBoxSCSI: Always reset the state if the protocol is violated and make it possible to reset the state from the BIOS

Location:

trunk/src/VBox/Devices

Files:

• PC/BIOS/scsi.c (modified) (3 diffs)
• Storage/VBoxSCSI.cpp (modified) (5 diffs)
• Storage/VBoxSCSI.h (modified) (2 diffs)

trunk/src/VBox/Devices/PC/BIOS/scsi.c

@@ -29 +29 @@
 #define VBOXSCSI_REGISTER_DATA_IN  1
 #define VBOXSCSI_REGISTER_IDENTIFY 2
+#define VBOXSCSI_REGISTER_RESET    3
 
 #define VBOXSCSI_MAX_DEVICES 16 /* Maximum number of devices a SCSI device can have. */
@@ -456 +457 @@
         /* Detected - Enumerate attached devices. */
         VBOXSCSI_DEBUG("scsi_init: BusLogic SCSI adapter detected\n");
+        outb(BUSLOGIC_ISA_IO_PORT+VBOXSCSI_REGISTER_RESET, 0);
         scsi_enumerate_attached_devices(BUSLOGIC_ISA_IO_PORT);
     }
@@ -471 +473 @@
         /* Detected - Enumerate attached devices. */
         VBOXSCSI_DEBUG("scsi_init: LsiLogic SCSI adapter detected\n");
+        outb(LSILOGIC_ISA_IO_PORT+VBOXSCSI_REGISTER_RESET, 0);
         scsi_enumerate_attached_devices(LSILOGIC_ISA_IO_PORT);
     }

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

@@ -41 +41 @@
 #include "VBoxSCSI.h"
 
-/**
- * Initializes the state for the SCSI interface.
- *
- * @returns VBox status code.
- * @param   pVBoxSCSI    Pointer to the unitialized SCSI state.
- */
-int vboxscsiInitialize(PVBOXSCSI pVBoxSCSI)
+static void vboxscsiReset(PVBOXSCSI pVBoxSCSI)
 {
     pVBoxSCSI->regIdentify = 0;
@@ -56 +50 @@
     pVBoxSCSI->cbBuf       = 0;
     pVBoxSCSI->iBuf        = 0;
+    if (pVBoxSCSI->pBuf)
+        RTMemFree(pVBoxSCSI->pBuf);
+
     pVBoxSCSI->pBuf        = NULL;
     pVBoxSCSI->enmState    = VBOXSCSISTATE_NO_COMMAND;
+
+}
+
+/**
+ * Initializes the state for the SCSI interface.
+ *
+ * @returns VBox status code.
+ * @param   pVBoxSCSI    Pointer to the unitialized SCSI state.
+ */
+int vboxscsiInitialize(PVBOXSCSI pVBoxSCSI)
+{
+    pVBoxSCSI->pBuf        = NULL;
+    vboxscsiReset(pVBoxSCSI);
 
     return VINF_SUCCESS;
@@ -153 +163 @@
             else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_TXDIR)
             {
-                pVBoxSCSI->enmState = VBOXSCSISTATE_READ_CDB_SIZE;
-                pVBoxSCSI->uTxDir = uVal;
+                if (uVal != VBOXSCSI_TXDIR_FROM_DEVICE && uVal != VBOXSCSI_TXDIR_TO_DEVICE)
+                    vboxscsiReset(pVBoxSCSI);
+                else
+                {
+                    pVBoxSCSI->enmState = VBOXSCSISTATE_READ_CDB_SIZE;
+                    pVBoxSCSI->uTxDir = uVal;
+                }
             }
             else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_CDB_SIZE)
             {
-                pVBoxSCSI->enmState = VBOXSCSISTATE_READ_BUFFER_SIZE_LOW;
-                pVBoxSCSI->cbCDB = uVal;
+                if (uVal > VBOXSCSI_CDB_SIZE_MAX)
+                    vboxscsiReset(pVBoxSCSI);
+                else
+                {
+                    pVBoxSCSI->enmState = VBOXSCSISTATE_READ_BUFFER_SIZE_LOW;
+                    pVBoxSCSI->cbCDB = uVal;
+                }
             }
             else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_BUFFER_SIZE_LOW)
@@ -202 +222 @@
         case 1:
         {
-            AssertMsg(pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY, ("Invalid state\n"));
-            pVBoxSCSI->pBuf[pVBoxSCSI->iBuf++] = uVal;
-            if (pVBoxSCSI->iBuf == pVBoxSCSI->cbBuf)
-            {
-                rc = VERR_MORE_DATA;
-                ASMAtomicXchgBool(&pVBoxSCSI->fBusy, true);
+            if (   pVBoxSCSI->enmState != VBOXSCSISTATE_COMMAND_READY
+                || pVBoxSCSI->uTxDir != VBOXSCSI_TXDIR_TO_DEVICE)
+            {
+                /* Reset the state */
+                vboxscsiReset(pVBoxSCSI);
+            }
+            else
+            {
+                pVBoxSCSI->pBuf[pVBoxSCSI->iBuf++] = uVal;
+                if (pVBoxSCSI->iBuf == pVBoxSCSI->cbBuf)
+                {
+                    rc = VERR_MORE_DATA;
+                    ASMAtomicXchgBool(&pVBoxSCSI->fBusy, true);
+                }
             }
             break;
@@ -214 +242 @@
         {
             pVBoxSCSI->regIdentify = uVal;
+            break;
+        }
+        case 3:
+        {
+            /* Reset */
+            vboxscsiReset(pVBoxSCSI);
             break;
         }

trunk/src/VBox/Devices/Storage/VBoxSCSI.h

@@ -44 +44 @@
  * |   2    |  R/W   | Detect   |
  * +--------+--------+----------+
+ * |   3    |  Write | Reset    |
+ * +--------+--------+----------+
  *
  * The register at port 0 receives the SCSI CDB issued from the driver when writing to it but
@@ -82 +84 @@
 #define VBOXSCSI_TXDIR_FROM_DEVICE 0
 #define VBOXSCSI_TXDIR_TO_DEVICE   1
+
+/** Maximum CDB size the BIOS driver sends. */
+#define VBOXSCSI_CDB_SIZE_MAX     10
 
 typedef struct VBOXSCSI