Changeset 45cae6b in mainline for uspace/drv/bus/usb/usbmast/bo_trans.c

Timestamp:

2011-07-24T16:05:37Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

582fe388

Parents:

4022513

Message:

Work on USB mass storage:

• handle pipe stalls when transferring data
• distinguish between transport failure and failed command (i.e. check condition)
• when a command fails, read sense data and log sense key, ASC, ASCQ

File:

• uspace/drv/bus/usb/usbmast/bo_trans.c (modified) (11 diffs)

uspace/drv/bus/usb/usbmast/bo_trans.c

@@ -64 +64 @@
  * @param dbuf_size     Size of the data buffer
  * @param xferred_size  Number of bytes actually transferred
+ * @param cmd_status    Command status
  *
  * @return              Error code
@@ -69 +70 @@
 static int usb_massstor_cmd(usbmast_fun_t *mfun, uint32_t tag, const void *cmd,
     size_t cmd_size, usb_direction_t ddir, void *dbuf, size_t dbuf_size,
-    size_t *xferred_size)
+    size_t *xferred_size, cmd_status_t *cmd_status)
 {
         int rc;
+        int retval = EOK;
         size_t act_size;
         usb_pipe_t *bulk_in_pipe = mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe;
@@ -82 +84 @@
 
         /* Send the CBW. */
+        MASTLOG("Sending CBW.\n");
         rc = usb_pipe_write(bulk_out_pipe, &cbw, sizeof(cbw));
         MASTLOG("CBW '%s' sent: %s.\n",
             usb_debug_str_buffer((uint8_t *) &cbw, sizeof(cbw), 0),
             str_error(rc));
-        if (rc != EOK) {
-                return rc;
-        }
-
+        if (rc != EOK)
+                return EIO;
+
+        MASTLOG("Transferring data.\n");
         if (ddir == USB_DIRECTION_IN) {
                 /* Recieve data from the device. */
@@ -104 +107 @@
         }
 
-        if (rc != EOK) {
-                /*
-                 * XXX If the pipe is stalled, we should clear it
-                 * and read CSW.
-                 */
-                return rc;
+        if (rc == ESTALL) {
+                /* Clear stall condition and continue below to read CSW. */
+                if (ddir == USB_DIRECTION_IN) {
+                        usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
+                            mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
+                } else {
+                        usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
+                            mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
+                }
+        } else if (rc != EOK) {
+                return EIO;
         }
 
@@ -115 +123 @@
         usb_massstor_csw_t csw;
         size_t csw_size;
+        MASTLOG("Reading CSW.\n");
         rc = usb_pipe_read(bulk_in_pipe, &csw, sizeof(csw), &csw_size);
         MASTLOG("CSW '%s' received (%zu bytes): %s.\n",
@@ -121 +130 @@
         if (rc != EOK) {
                 MASTLOG("rc != EOK\n");
-                return rc;
+                return EIO;
         }
 
         if (csw_size != sizeof(csw)) {
                 MASTLOG("csw_size != sizeof(csw)\n");
-                return ERANGE;
+                return EIO;
         }
 
         if (csw.dCSWTag != tag) {
                 MASTLOG("csw.dCSWTag != tag\n");
-                return EBADCHECKSUM;
+                return EIO;
         }
 
@@ -137 +146 @@
          * Determine the actual return value from the CSW.
          */
-        if (csw.dCSWStatus != 0) {
-                MASTLOG("csw.dCSWStatus != 0\n");
-                // FIXME: better error code
-                // FIXME: distinguish 0x01 and 0x02
-                return EXDEV;
+        switch (csw.dCSWStatus) {
+        case cbs_passed:
+                *cmd_status = CMDS_GOOD;
+                break;
+        case cbs_failed:
+                MASTLOG("Command failed\n");
+                *cmd_status = CMDS_FAILED;
+                break;
+        case cbs_phase_error:
+                MASTLOG("Phase error\n");
+                retval = EIO;
+                break;
+        default:
+                retval = EIO;
+                break;
         }
 
@@ -147 +166 @@
         if (residue > dbuf_size) {
                 MASTLOG("residue > dbuf_size\n");
-                return ERANGE;
+                return EIO;
         }
 
@@ -161 +180 @@
                 *xferred_size = dbuf_size - residue;
 
-        return EOK;
+        return retval;
 }
 
@@ -174 +193 @@
  * @param dbuf_size     Data receive buffer size in bytes
  * @param proc_size     Number of bytes actually processed by device
+ * @param cmd_status    Command status
  *
  * @return Error code
  */
 int usb_massstor_data_in(usbmast_fun_t *mfun, uint32_t tag, const void *cmd,
-    size_t cmd_size, void *dbuf, size_t dbuf_size, size_t *proc_size)
+    size_t cmd_size, void *dbuf, size_t dbuf_size, size_t *proc_size,
+    cmd_status_t *cmd_status)
 {
         return usb_massstor_cmd(mfun, tag, cmd, cmd_size, USB_DIRECTION_IN,
-            dbuf, dbuf_size, proc_size);
+            dbuf, dbuf_size, proc_size, cmd_status);
 }
 
@@ -194 +215 @@
  * @param data_size     Size of @a data in bytes
  * @param proc_size     Number of bytes actually processed by device
+ * @param cmd_status    Command status
  *
  * @return Error code
  */
 int usb_massstor_data_out(usbmast_fun_t *mfun, uint32_t tag, const void *cmd,
-    size_t cmd_size, const void *data, size_t data_size, size_t *proc_size)
+    size_t cmd_size, const void *data, size_t data_size, size_t *proc_size,
+    cmd_status_t *cmd_status)
 {
         return usb_massstor_cmd(mfun, tag, cmd, cmd_size, USB_DIRECTION_OUT,
-            (void *) data, data_size, proc_size);
+            (void *) data, data_size, proc_size, cmd_status);
 }