Changeset 43659 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 16, 2012 4:25:26 PM (12 years ago)

Author:

vboxsync

Message:

VBoxSCSI: Slightly extended interface to allow error reporting.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevBusLogic.cpp (modified) (3 diffs)
• DevLsiLogicSCSI.cpp (modified) (3 diffs)
• VBoxSCSI.cpp (modified) (7 diffs)
• VBoxSCSI.h (modified) (7 diffs)

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

@@ -2063 +2063 @@
         memcpy(pBusLogic->VBoxSCSI.pBuf, &ScsiInquiryData, 5);
 
-        rc = vboxscsiRequestFinished(&pBusLogic->VBoxSCSI, &pTaskState->PDMScsiRequest);
+        rc = vboxscsiRequestFinished(&pBusLogic->VBoxSCSI, &pTaskState->PDMScsiRequest, SCSI_STATUS_OK);
         AssertMsgRCReturn(rc, ("Finishing BIOS SCSI request failed rc=%Rrc\n", rc), rc);
 
@@ -2402 +2402 @@
         if (pTaskState->fBIOS)
         {
-            rc = vboxscsiRequestFinished(&pBusLogic->VBoxSCSI, pSCSIRequest);
+            rc = vboxscsiRequestFinished(&pBusLogic->VBoxSCSI, pSCSIRequest, rcCompletion);
             AssertMsgRC(rc, ("Finishing BIOS SCSI request failed rc=%Rrc\n", rc));
         }
@@ -3367 +3367 @@
     {
         /* Register I/O port space for BIOS access. */
-        rc = PDMDevHlpIOPortRegister(pDevIns, BUSLOGIC_BIOS_IO_PORT, 3, NULL,
+        rc = PDMDevHlpIOPortRegister(pDevIns, BUSLOGIC_BIOS_IO_PORT, 4, NULL,
                                      buslogicBIOSIOPortWrite, buslogicBIOSIOPortRead,
                                      buslogicBIOSIOPortWriteStr, buslogicBIOSIOPortReadStr,

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

@@ -2110 +2110 @@
         if (RT_UNLIKELY(pTaskState->fBIOS))
         {
-            int rc = vboxscsiRequestFinished(&pLsiLogic->VBoxSCSI, pSCSIRequest);
+            int rc = vboxscsiRequestFinished(&pLsiLogic->VBoxSCSI, pSCSIRequest, rcCompletion);
             AssertMsgRC(rc, ("Finishing BIOS SCSI request failed rc=%Rrc\n", rc));
         }
@@ -3728 +3728 @@
     memcpy(pLsiLogic->VBoxSCSI.pBuf, &ScsiInquiryData, 5);
 
-    rc = vboxscsiRequestFinished(&pLsiLogic->VBoxSCSI, &pTaskState->PDMScsiRequest);
+    rc = vboxscsiRequestFinished(&pLsiLogic->VBoxSCSI, &pTaskState->PDMScsiRequest, SCSI_STATUS_OK);
     AssertMsgRCReturn(rc, ("Finishing BIOS SCSI request failed rc=%Rrc\n", rc), rc);
 
@@ -5230 +5230 @@
     {
         if (pThis->enmCtrlType == LSILOGICCTRLTYPE_SCSI_SPI)
-            rc = PDMDevHlpIOPortRegister(pDevIns, LSILOGIC_BIOS_IO_PORT, 3, NULL,
+            rc = PDMDevHlpIOPortRegister(pDevIns, LSILOGIC_BIOS_IO_PORT, 4, NULL,
                                          lsilogicIsaIOPortWrite, lsilogicIsaIOPortRead,
                                          lsilogicIsaIOPortWriteStr, lsilogicIsaIOPortReadStr,

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

@@ -39 +39 @@
 static void vboxscsiReset(PVBOXSCSI pVBoxSCSI)
 {
-    pVBoxSCSI->regIdentify = 0;
-    pVBoxSCSI->cbCDB       = 0;
+    pVBoxSCSI->regIdentify   = 0;
+    pVBoxSCSI->cbCDB         = 0;
     memset(pVBoxSCSI->aCDB, 0, sizeof(pVBoxSCSI->aCDB));
-    pVBoxSCSI->iCDB        = 0;
-    pVBoxSCSI->fBusy       = false;
-    pVBoxSCSI->cbBuf       = 0;
-    pVBoxSCSI->iBuf        = 0;
+    pVBoxSCSI->iCDB          = 0;
+    pVBoxSCSI->fBusy         = false;
+    pVBoxSCSI->rcCompletion  = 0;
+    pVBoxSCSI->uTargetDevice = 0;
+    pVBoxSCSI->cbBuf         = 0;
+    pVBoxSCSI->iBuf          = 0;
     if (pVBoxSCSI->pBuf)
         RTMemFree(pVBoxSCSI->pBuf);
 
-    pVBoxSCSI->pBuf        = NULL;
-    pVBoxSCSI->enmState    = VBOXSCSISTATE_NO_COMMAND;
-
+    pVBoxSCSI->pBuf          = NULL;
+    pVBoxSCSI->enmState      = VBOXSCSISTATE_NO_COMMAND;
 }
 
@@ -92 +93 @@
                 RTThreadYield();
             }
-            else
-                uVal &= ~VBOX_SCSI_BUSY;
+            if (pVBoxSCSI->rcCompletion)
+                uVal |= VBOX_SCSI_ERROR;
             break;
         }
@@ -117 +118 @@
                     pVBoxSCSI->iCDB  = 0;
                     pVBoxSCSI->iBuf  = 0;
+                    pVBoxSCSI->rcCompletion = 0;
                     pVBoxSCSI->uTargetDevice = 0;
                     pVBoxSCSI->enmState = VBOXSCSISTATE_NO_COMMAND;
@@ -127 +129 @@
         {
             uVal = pVBoxSCSI->regIdentify;
+            break;
+        }
+        case 3:
+        {
+            uVal = pVBoxSCSI->rcCompletion;
             break;
         }
@@ -275 +282 @@
     AssertMsg(pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY, ("Invalid state %u\n", pVBoxSCSI->enmState));
 
+    /* Clear any errors from a previous request. */
+    pVBoxSCSI->rcCompletion = 0;
+
     if (pVBoxSCSI->uTxDir == VBOXSCSI_TXDIR_FROM_DEVICE)
     {
@@ -316 +326 @@
  * is ready at the incoming data port.
  */
-int vboxscsiRequestFinished(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest)
+int vboxscsiRequestFinished(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest, int rcCompletion)
 {
     LogFlowFunc(("pVBoxSCSI=%#p pScsiRequest=%#p\n", pVBoxSCSI, pScsiRequest));
@@ -335 +345 @@
         memset(pVBoxSCSI->aCDB, 0, sizeof(pVBoxSCSI->aCDB));
     }
+
+    pVBoxSCSI->rcCompletion = rcCompletion;
 
     ASMAtomicXchgBool(&pVBoxSCSI->fBusy, false);

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

@@ -24 +24 @@
  *
  * The BusLogic interface if available will be starting at port 0x330
- * and the LsiLogic starts at 0x340 and each will have a size of 3 ports.
+ * and the LsiLogic starts at 0x340 and each will have a size of 4 ports.
  * The ports are used as described below:
  *
@@ -39 +39 @@
  * +--------+--------+----------+
  * |   2    |  R/W   | Detect   |
+ * +--------+--------+----------+
+ * |   3    |  Read  | SCSI rc  |
  * +--------+--------+----------+
  * |   3    |  Write | Reset    |
@@ -55 +57 @@
  * again the adapter is available.
  *
+ * Any write to the register at offset 3 causes the interface to be reset. A read returns
+ * the SCSI status code of the last operation.
+ * 
  * This part has no R0 or GC components.
  */
@@ -66 +71 @@
 //#define DEBUG
 #include <VBox/vmm/pdmdev.h>
+#include <VBox/scsi.h>
 
 typedef enum VBOXSCSISTATE
@@ -109 +115 @@
     /** Current position in the buffer. */
     uint32_t             iBuf;
+    /** The result code of last operation. */
+    int                  rcCompletion;
     /** Flag whether a request is pending. */
     volatile bool        fBusy;
@@ -115 +123 @@
 } VBOXSCSI, *PVBOXSCSI;
 
-#define VBOX_SCSI_BUSY RT_BIT(0)
+#define VBOX_SCSI_BUSY  RT_BIT(0)
+#define VBOX_SCSI_ERROR RT_BIT(1)
 
 #ifdef IN_RING3
@@ -123 +132 @@
 int vboxscsiWriteRegister(PVBOXSCSI pVBoxSCSI, uint8_t iRegister, uint8_t uVal);
 int vboxscsiSetupRequest(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest, uint32_t *puTargetDevice);
-int vboxscsiRequestFinished(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest);
+int vboxscsiRequestFinished(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest, int rcCompletion);
 void vboxscsiSetRequestRedo(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest);
 int vboxscsiWriteString(PPDMDEVINS pDevIns, PVBOXSCSI pVBoxSCSI, uint8_t iRegister,