1 files changed, 23 insertions, 21 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 0009818a4306..00a9a6c8f83c 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -333,6 +333,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg)
         scsi_cmd[8]  = args[3];
         scsi_cmd[10] = args[4];
         scsi_cmd[12] = args[5];
+        scsi_cmd[13] = args[6] & 0x0f;
         scsi_cmd[14] = args[0];
 
         /* Good values for timeout and retries?  Values below
@@ -781,7 +782,7 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
          */
         if (qc->err_mask ||
             tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
-                ata_to_sense_error(qc->ap->id, tf->command, tf->feature,
+                ata_to_sense_error(qc->ap->print_id, tf->command, tf->feature,
                                    &sb[1], &sb[2], &sb[3], verbose);
                 sb[1] &= 0x0f;
         }
@@ -854,7 +855,7 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc)
          */
         if (qc->err_mask ||
             tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
-                ata_to_sense_error(qc->ap->id, tf->command, tf->feature,
+                ata_to_sense_error(qc->ap->print_id, tf->command, tf->feature,
                                    &sb[1], &sb[2], &sb[3], verbose);
                 sb[1] &= 0x0f;
         }
@@ -986,29 +987,32 @@ int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)
         struct ata_port *ap = ata_shost_to_port(sdev->host);
         struct ata_device *dev;
         unsigned long flags;
-        int max_depth;
 
-        if (queue_depth < 1)
+        if (queue_depth < 1 || queue_depth == sdev->queue_depth)
                 return sdev->queue_depth;
 
         dev = ata_scsi_find_dev(ap, sdev);
         if (!dev || !ata_dev_enabled(dev))
                 return sdev->queue_depth;
 
-        max_depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id));
-        max_depth = min(ATA_MAX_QUEUE - 1, max_depth);
-        if (queue_depth > max_depth)
-                queue_depth = max_depth;
-
-        scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, queue_depth);
-
+        /* NCQ enabled? */
         spin_lock_irqsave(ap->lock, flags);
-        if (queue_depth > 1)
-                dev->flags &= ~ATA_DFLAG_NCQ_OFF;
-        else
+        dev->flags &= ~ATA_DFLAG_NCQ_OFF;
+        if (queue_depth == 1 || !ata_ncq_enabled(dev)) {
                 dev->flags |= ATA_DFLAG_NCQ_OFF;
+                queue_depth = 1;
+        }
         spin_unlock_irqrestore(ap->lock, flags);
 
+        /* limit and apply queue depth */
+        queue_depth = min(queue_depth, sdev->host->can_queue);
+        queue_depth = min(queue_depth, ata_id_queue_depth(dev->id));
+        queue_depth = min(queue_depth, ATA_MAX_QUEUE - 1);
+
+        if (sdev->queue_depth == queue_depth)
+                return -EINVAL;
+
+        scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, queue_depth);
         return queue_depth;
 }
 
@@ -1469,7 +1473,7 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
         }
 
         if (need_sense && !ap->ops->error_handler)
-                ata_dump_status(ap->id, &qc->result_tf);
+                ata_dump_status(ap->print_id, &qc->result_tf);
 
         qc->scsidone(cmd);
 
@@ -1495,11 +1499,9 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
 static int ata_scmd_need_defer(struct ata_device *dev, int is_io)
 {
         struct ata_port *ap = dev->ap;
+        int is_ncq = is_io && ata_ncq_enabled(dev);
 
-        if (!(dev->flags & ATA_DFLAG_NCQ))
-                return 0;
-
-        if (is_io) {
+        if (is_ncq) {
                 if (!ata_tag_valid(ap->active_tag))
                         return 0;
         } else {
@@ -2774,7 +2776,7 @@ static inline void ata_scsi_dump_cdb(struct ata_port *ap,
         u8 *scsicmd = cmd->cmnd;
 
         DPRINTK("CDB (%u:%d,%d,%d) %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
-                ap->id,
+                ap->print_id,
                 scsidev->channel, scsidev->id, scsidev->lun,
                 scsicmd[0], scsicmd[1], scsicmd[2], scsicmd[3],
                 scsicmd[4], scsicmd[5], scsicmd[6], scsicmd[7],
@@ -3234,7 +3236,7 @@ struct ata_port *ata_sas_port_alloc(struct ata_host *host,
 
         ata_port_init(ap, host, ent, 0);
         ap->lock = shost->host_lock;
-        kfree(ent);
+        devm_kfree(host->dev, ent);
         return ap;
 }
 EXPORT_SYMBOL_GPL(ata_sas_port_alloc);