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

Timestamp:

2011-07-24T16:05:37Z (14 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/scsi_ms.c (modified) (11 diffs)

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

@@ -61 +61 @@
 }
 
+static void usbmast_dump_sense(usbmast_fun_t *mfun)
+{
+        scsi_sense_data_t sense_buf;
+        int rc;
+
+        rc = usbmast_request_sense(mfun, &sense_buf, sizeof(sense_buf));
+        if (rc == EOK) {
+                printf("Got sense data (sense_key=0x%x, asc=0x%02x, "
+                    "ascq=0x%02x.\n", sense_buf.flags_key & 0x0f,
+                    sense_buf.additional_code,
+                    sense_buf.additional_cqual);
+        } else {
+                printf("Failed to read sense data.\n");
+        }
+}
+
 /** Perform SCSI Inquiry command on USB mass storage device.
  *
@@ -72 +88 @@
         size_t response_len;
         scsi_cdb_inquiry_t cdb;
+        cmd_status_t status;
         int rc;
 
@@ -79 +96 @@
 
         rc = usb_massstor_data_in(mfun, 0xDEADBEEF, (uint8_t *) &cdb,
-            sizeof(cdb), &inq_data, sizeof(inq_data), &response_len);
+            sizeof(cdb), &inq_data, sizeof(inq_data), &response_len, &status);
 
         if (rc != EOK) {
-                usb_log_error("Inquiry failed, device %s: %s.\n",
-                   mfun->mdev->ddf_dev->name, str_error(rc));
-                return rc;
+                usb_log_error("Inquiry transport failed, device %s: %s.\n",
+                   mfun->mdev->ddf_dev->name, str_error(rc));
+                return rc;
+        }
+
+        if (status != CMDS_GOOD) {
+                usb_log_error("Inquiry command failed, device %s.\n",
+                   mfun->mdev->ddf_dev->name);
+                usbmast_dump_sense(mfun);
+                return EIO;
         }
 
@@ -129 +153 @@
         scsi_cdb_request_sense_t cdb;
         size_t data_len;
+        cmd_status_t status;
         int rc;
 
@@ -136 +161 @@
 
         rc = usb_massstor_data_in(mfun, 0xDEADBEEF, (uint8_t *) &cdb,
-            sizeof(cdb), buf, size, &data_len);
-
-        if (rc != EOK) {
+            sizeof(cdb), buf, size, &data_len, &status);
+
+        if (rc != EOK || status != CMDS_GOOD) {
                 usb_log_error("Request Sense failed, device %s: %s.\n",
                    mfun->mdev->ddf_dev->name, str_error(rc));
@@ -167 +192 @@
         scsi_read_capacity_10_data_t data;
         size_t data_len;
+        cmd_status_t status;
         int rc;
 
@@ -173 +199 @@
 
         rc = usb_massstor_data_in(mfun, 0xDEADBEEF, (uint8_t *) &cdb,
-            sizeof(cdb), &data, sizeof(data), &data_len);
+            sizeof(cdb), &data, sizeof(data), &data_len, &status);
 
         if (rc != EOK) {
-                usb_log_error("Read Capacity (10) failed, device %s: %s.\n",
-                   mfun->mdev->ddf_dev->name, str_error(rc));
-                return rc;
+                usb_log_error("Read Capacity (10) transport failed, device %s: %s.\n",
+                   mfun->mdev->ddf_dev->name, str_error(rc));
+                return rc;
+        }
+
+        if (status != CMDS_GOOD) {
+                usb_log_error("Read Capacity (10) command failed, device %s.\n",
+                   mfun->mdev->ddf_dev->name);
+                usbmast_dump_sense(mfun);
+                return EIO;
         }
 
@@ -205 +238 @@
         scsi_cdb_read_12_t cdb;
         size_t data_len;
+        cmd_status_t status;
         int rc;
 
@@ -221 +255 @@
 
         rc = usb_massstor_data_in(mfun, 0xDEADBEEF, (uint8_t *) &cdb,
-            sizeof(cdb), buf, nblocks * mfun->block_size, &data_len);
+            sizeof(cdb), buf, nblocks * mfun->block_size, &data_len, &status);
 
         if (rc != EOK) {
-                usb_log_error("Read (12) failed, device %s: %s.\n",
-                   mfun->mdev->ddf_dev->name, str_error(rc));
-                return rc;
+                usb_log_error("Read (12) transport failed, device %s: %s.\n",
+                   mfun->mdev->ddf_dev->name, str_error(rc));
+                return rc;
+        }
+
+        if (status != CMDS_GOOD) {
+                usb_log_error("Read (12) command failed, device %s.\n",
+                   mfun->mdev->ddf_dev->name);
+                usbmast_dump_sense(mfun);
+                return EIO;
         }
 
@@ -252 +293 @@
         scsi_cdb_write_12_t cdb;
         size_t sent_len;
+        cmd_status_t status;
         int rc;
 
@@ -266 +308 @@
 
         rc = usb_massstor_data_out(mfun, 0xDEADBEEF, (uint8_t *) &cdb,
-            sizeof(cdb), data, nblocks * mfun->block_size, &sent_len);
+            sizeof(cdb), data, nblocks * mfun->block_size, &sent_len, &status);
 
         if (rc != EOK) {
-                usb_log_error("Write (12) failed, device %s: %s.\n",
-                   mfun->mdev->ddf_dev->name, str_error(rc));
-                return rc;
+                usb_log_error("Write (12) transport failed, device %s: %s.\n",
+                   mfun->mdev->ddf_dev->name, str_error(rc));
+                return rc;
+        }
+
+        if (status != CMDS_GOOD) {
+                usb_log_error("Write (12) command failed, device %s.\n",
+                   mfun->mdev->ddf_dev->name);
+                usbmast_dump_sense(mfun);
+                return EIO;
         }