1 files changed, 53 insertions, 16 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index b0d0cc41f3e8..47ea111d5ace 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -164,10 +164,10 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
 {
         int rc = 0;
         u8 scsi_cmd[MAX_COMMAND_SIZE];
-        u8 args[4], *argbuf = NULL;
+        u8 args[4], *argbuf = NULL, *sensebuf = NULL;
         int argsize = 0;
-        struct scsi_sense_hdr sshdr;
         enum dma_data_direction data_dir;
+        int cmd_result;
 
         if (arg == NULL)
                 return -EINVAL;
@@ -175,6 +175,10 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
         if (copy_from_user(args, arg, sizeof(args)))
                 return -EFAULT;
 
+        sensebuf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_NOIO);
+        if (!sensebuf)
+                return -ENOMEM;
+
         memset(scsi_cmd, 0, sizeof(scsi_cmd));
 
         if (args[3]) {
@@ -191,7 +195,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
                 data_dir = DMA_FROM_DEVICE;
         } else {
                 scsi_cmd[1]  = (3 << 1); /* Non-data */
-                /* scsi_cmd[2] is already 0 -- no off.line, cc, or data xfer */
+                scsi_cmd[2]  = 0x20;     /* cc but no off.line or data xfer */
                 data_dir = DMA_NONE;
         }
 
@@ -210,18 +214,46 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
 
         /* Good values for timeout and retries?  Values below
            from scsi_ioctl_send_command() for default case... */
-        if (scsi_execute_req(scsidev, scsi_cmd, data_dir, argbuf, argsize,
-                             &sshdr, (10*HZ), 5)) {
+        cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,
+                                  sensebuf, (10*HZ), 5, 0);
+
+        if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */
+                u8 *desc = sensebuf + 8;
+                cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */
+
+                /* If we set cc then ATA pass-through will cause a
+                 * check condition even if no error. Filter that. */
+                if (cmd_result & SAM_STAT_CHECK_CONDITION) {
+                        struct scsi_sense_hdr sshdr;
+                        scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE,
+                                              &sshdr);
+                        if (sshdr.sense_key==0 &&
+                            sshdr.asc==0 && sshdr.ascq==0)
+                                cmd_result &= ~SAM_STAT_CHECK_CONDITION;
+                }
+
+                /* Send userspace a few ATA registers (same as drivers/ide) */
+                if (sensebuf[0] == 0x72 &&     /* format is "descriptor" */
+                    desc[0] == 0x09 ) {        /* code is "ATA Descriptor" */
+                        args[0] = desc[13];    /* status */
+                        args[1] = desc[3];     /* error */
+                        args[2] = desc[5];     /* sector count (0:7) */
+                        if (copy_to_user(arg, args, sizeof(args)))
+                                rc = -EFAULT;
+                }
+        }
+
+
+        if (cmd_result) {
                 rc = -EIO;
                 goto error;
         }
 
-        /* Need code to retrieve data from check condition? */
-
         if ((argbuf)
          && copy_to_user(arg + sizeof(args), argbuf, argsize))
                 rc = -EFAULT;
 error:
+        kfree(sensebuf);
         kfree(argbuf);
         return rc;
 }
@@ -1419,6 +1451,7 @@ nothing_to_do:
 
 static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
 {
+        struct ata_port *ap = qc->ap;
         struct scsi_cmnd *cmd = qc->scsicmd;
         u8 *cdb = cmd->cmnd;
         int need_sense = (qc->err_mask != 0);
@@ -1427,11 +1460,12 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
          * schedule EH_REVALIDATE operation to update the IDENTIFY DEVICE
          * cache
          */
-        if (!need_sense && (qc->tf.command == ATA_CMD_SET_FEATURES) &&
+        if (ap->ops->error_handler &&
+            !need_sense && (qc->tf.command == ATA_CMD_SET_FEATURES) &&
             ((qc->tf.feature == SETFEATURES_WC_ON) ||
              (qc->tf.feature == SETFEATURES_WC_OFF))) {
-                qc->ap->eh_info.action |= ATA_EH_REVALIDATE;
-                ata_port_schedule_eh(qc->ap);
+                ap->eh_info.action |= ATA_EH_REVALIDATE;
+                ata_port_schedule_eh(ap);
         }
 
         /* For ATA pass thru (SAT) commands, generate a sense block if
@@ -1458,8 +1492,8 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
                 }
         }
 
-        if (need_sense && !qc->ap->ops->error_handler)
-                ata_dump_status(qc->ap->id, &qc->result_tf);
+        if (need_sense && !ap->ops->error_handler)
+                ata_dump_status(ap->id, &qc->result_tf);
 
         qc->scsidone(cmd);
 
@@ -1580,9 +1614,9 @@ early_finish:
 
 err_did:
         ata_qc_free(qc);
-err_mem:
         cmd->result = (DID_ERROR << 16);
         done(cmd);
+err_mem:
         DPRINTK("EXIT - internal\n");
         return 0;
 
@@ -3313,20 +3347,23 @@ EXPORT_SYMBOL_GPL(ata_sas_slave_configure);
  *      @ap:    ATA port to which the command is being sent
  *
  *      RETURNS:
- *      Zero.
+ *      Return value from __ata_scsi_queuecmd() if @cmd can be queued,
+ *      0 otherwise.
  */
 
 int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *),
                      struct ata_port *ap)
 {
+        int rc = 0;
+
         ata_scsi_dump_cdb(ap, cmd);
 
         if (likely(ata_scsi_dev_enabled(ap->device)))
-                __ata_scsi_queuecmd(cmd, done, ap->device);
+                rc = __ata_scsi_queuecmd(cmd, done, ap->device);
         else {
                 cmd->result = (DID_BAD_TARGET << 16);
                 done(cmd);
         }
-        return 0;
+        return rc;
 }
 EXPORT_SYMBOL_GPL(ata_sas_queuecmd);