Changeset 64412 in vbox

Timestamp:

Oct 25, 2016 11:57:44 AM (8 years ago)

Author:

vboxsync

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

111526

Message:

VSCSI: Start on support for SCSI_MAINTENANCE_IN_REPORT_SUPP_OPC, work in progress not enabled

Location:

trunk/src/VBox/Devices/Storage/VSCSI

Files:

• VSCSIDevice.cpp (modified) (1 diff)
• VSCSIInternal.h (modified) (2 diffs)
• VSCSILunMmc.cpp (modified) (1 diff)
• VSCSILunSbc.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp

@@ -120 +120 @@
             break;
         }
+#if 0
+        case SCSI_MAINTENANCE_IN:
+        {
+            if (pVScsiReq->pbCDB[1] == SCSI_MAINTENANCE_IN_REPORT_SUPP_OPC)
+            {
+                /*
+                 * If the LUN is present and has the CDB info set we will execute the command, otherwise
+                 * just fail with an illegal request error.
+                 */
+                if (vscsiDeviceLunIsPresent(pVScsiDevice, pVScsiReq->iLun))
+                {
+                    PVSCSILUNINT pVScsiLun = pVScsiDevice->papVScsiLun[pVScsiReq->iLun];
+                    if (pVScsiLun->pVScsiLunDesc->paSupOpcInfo)
+                    {
+                        bool fTimeoutDesc = RT_BOOL(pVScsiReq->pbCDB[2] & 0x80);
+                        uint8_t u8ReportMode = pVScsiReq->pbCDB[2] & 0x7;
+                        uint8_t u8Opc = pVScsiReq->pbCDB[3];
+                        uint16_t u16SvcAction = vscsiBE2HU16(&pVScsiReq->pbCDB[4]);
+                        uint16_t cbData = vscsiBE2HU16(&pVScsiReq->pbCDB[6]);
+
+                        switch (u8ReportMode)
+                        {
+                            case 0:
+                                *prcReq = vscsiDeviceReportAllSupportedOpc(pVScsiLun, pVScsiReq, fTimeoutDesc, cbData);
+                                break;
+                            case 1:
+                                *prcReq = vscsiDeviceReportOpc(pVScsiLun, pVScsiReq, u8Opc, fTimeoutDesc, cbData);
+                                break;
+                            case 2:
+                                *prcReq = vscsiDeviceReportOpc(pVScsiLun, pVScsiReq, u8Opc, fTimeoutDesc, cbData);
+                                break;
+                            default:
+                                *prcReq = vscsiReqSenseErrorSet(&pVScsiDevice->VScsiSense, pVScsiReq,
+                                                                SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET, 0x00);
+                        }
+                    }
+                    else
+                        *prcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE, 0x00);
+                }
+                else
+                    *prcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE, 0x00);
+            }
+            else
+                fProcessed = false; /* Might also be the SEND KEY MMC command. */
+        }
+#endif
         default:
             fProcessed = false;

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h

@@ -172 +172 @@
 
 /**
+ * Supported operation code information entry.
+ */
+typedef struct VSCSILUNSUPOPC
+{
+    /** The operation code. */
+    uint8_t                 u8Opc;
+    /** Service action code if required as indicated by
+     * VSCSI_LUN_SUP_OPC_SVC_ACTION_REQUIRED */
+    uint16_t                u16SvcAction;
+    /** Flags. */
+    uint32_t                fFlags;
+    /** Readable description for the op code. */
+    const char              *pszOpc;
+    /** The length of the CDB for this operation code. */
+    uint8_t                 cbCdb;
+    /** Pointer to the CDB usage data. */
+    uint8_t                 *pbCdbUsage;
+    /* The operation specific valuefor the timeout descriptor. */
+    uint8_t                 u8OpcTimeoutSpec;
+    /** The nominal processing timeout in seconds. */
+    uint16_t                cNominalProcessingTimeout;
+    /** The recommend timeout in seconds. */
+    uint16_t                cRecommendTimeout;
+} VSCSILUNSUPOPC;
+/** Pointer to a operation code information entry. */
+typedef VSCSILUNSUPOPC *PVSCSILUNSUPOPC;
+/** Pointer to a const operation code information entry. */
+typedef const VSCSILUNSUPOPC *PCVSCSILUNSUPOPC;
+
+/** @name Flags for the supported operation code infromation entries.
+ * @{ */
+/** Flag indicating wheter the service action member is valid and should be
+ * evaluated to find the desired opcode information. */
+#define VSCSI_LUN_SUP_OPC_SVC_ACTION_REQUIRED      RT_BIT_32(0)
+/** Flag whether the values for the timeout descriptor are valid. */
+#define VSCSI_LUN_SUP_OPC_TIMEOUT_DESC_VALID       RT_BIT_32(1)
+/** @} */
+
+/** @name Support macros to create supported operation code information entries.
+ * @{ */
+#define VSCSI_LUN_SUP_OPC(a_u8Opc, a_pszOpc, a_cbCdb, a_pbCdbUsage) \
+    { a_u8Opc, 0, 0, a_pszOpc, a_cbCdb, a_pbCdbUsage, 0, 0, 0}
+#define VSCSI_LUN_SUP_OPC_SVC(a_u8Opc, a_u16SvcAction, a_pszOpc, a_cbCdb, a_pbCdbUsage) \
+    { a_u8Opc, a_u16SvcAction, VSCSI_LUN_SUP_OPC_SVC_ACTION_REQUIRED, a_pszOpc, a_cbCdb, a_pbCdbUsage, 0, 0, 0}
+/** @} */
+
+/**
  * Virtual SCSI LUN descriptor.
  */
@@ -182 +229 @@
     /** LUN type size */
     size_t               cbLun;
+    /** Number of entries in the supported operation codes array. */
+    uint32_t             cSupOpcInfo;
+    /** Pointer to the array of supported operation codes for the
+     * REPORT RUPPORTED OPERATION CODES command handled by the generic
+     * device driver - optional.
+     */
+    PCVSCSILUNSUPOPC     paSupOpcInfo;
 
     /**

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp

@@ -1322 +1322 @@
     /** cbLun */
     sizeof(VSCSILUNMMC),
+    /** cSupOpcInfo */
+    0,
+    /** paSupOpcInfo */
+    NULL,
     /** pfnVScsiLunInit */
     vscsiLunMmcInit,

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp

@@ -588 +588 @@
     /** cbLun */
     sizeof(VSCSILUNSBC),
+    /** cSupOpcInfo */
+    0,
+    /** paSupOpcInfo */
+    NULL,
     /** pfnVScsiLunInit */
     vscsiLunSbcInit,