[SCSI] qla2xxx: Propagate block-layer tags on submitted I/Os.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 50 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 4c1ba6263eb3..d78d5896fc33 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -328,6 +328,7 @@ qla2x00_start_scsi(srb_t *sp)
         struct qla_hw_data *ha;
         struct req_que *req;
         struct rsp_que *rsp;
+        char            tag[2];
 
         /* Setup device pointers. */
         ret = 0;
@@ -406,7 +407,22 @@ qla2x00_start_scsi(srb_t *sp)
         cmd_pkt->lun = cpu_to_le16(sp->cmd->device->lun);
 
         /* Update tagged queuing modifier */
-        cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG);
+        if (scsi_populate_tag_msg(cmd, tag)) {
+                switch (tag[0]) {
+                case HEAD_OF_QUEUE_TAG:
+                        cmd_pkt->control_flags =
+                            __constant_cpu_to_le16(CF_HEAD_TAG);
+                        break;
+                case ORDERED_QUEUE_TAG:
+                        cmd_pkt->control_flags =
+                            __constant_cpu_to_le16(CF_ORDERED_TAG);
+                        break;
+                default:
+                        cmd_pkt->control_flags =
+                            __constant_cpu_to_le16(CF_SIMPLE_TAG);
+                        break;
+                }
+        }
 
         /* Load SCSI command packet. */
         memcpy(cmd_pkt->scsi_cdb, cmd->cmnd, cmd->cmd_len);
@@ -971,6 +987,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
         uint16_t                fcp_cmnd_len;
         struct fcp_cmnd         *fcp_cmnd;
         dma_addr_t              crc_ctx_dma;
+        char                    tag[2];
 
         cmd = sp->cmd;
 
@@ -1068,9 +1085,27 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
             LSD(crc_ctx_dma + CRC_CONTEXT_FCPCMND_OFF));
         cmd_pkt->fcp_cmnd_dseg_address[1] = cpu_to_le32(
             MSD(crc_ctx_dma + CRC_CONTEXT_FCPCMND_OFF));
-        fcp_cmnd->task_attribute = 0;
         fcp_cmnd->task_management = 0;
 
+        /*
+         * Update tagged queuing modifier if using command tag queuing
+         */
+        if (scsi_populate_tag_msg(cmd, tag)) {
+                switch (tag[0]) {
+                case HEAD_OF_QUEUE_TAG:
+                    fcp_cmnd->task_attribute = TSK_HEAD_OF_QUEUE;
+                    break;
+                case ORDERED_QUEUE_TAG:
+                    fcp_cmnd->task_attribute = TSK_ORDERED;
+                    break;
+                default:
+                    fcp_cmnd->task_attribute = 0;
+                    break;
+                }
+        } else {
+                fcp_cmnd->task_attribute = 0;
+        }
+
         cmd_pkt->fcp_rsp_dseg_len = 0; /* Let response come in status iocb */
 
         DEBUG18(printk(KERN_INFO "%s(%ld): Total SG(s) Entries %d, Data"
@@ -1177,6 +1212,7 @@ qla24xx_start_scsi(srb_t *sp)
         struct scsi_cmnd *cmd = sp->cmd;
         struct scsi_qla_host *vha = sp->fcport->vha;
         struct qla_hw_data *ha = vha->hw;
+        char            tag[2];
 
         /* Setup device pointers. */
         ret = 0;
@@ -1260,6 +1296,18 @@ qla24xx_start_scsi(srb_t *sp)
         int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
         host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
 
+        /* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */
+        if (scsi_populate_tag_msg(cmd, tag)) {
+                switch (tag[0]) {
+                case HEAD_OF_QUEUE_TAG:
+                        cmd_pkt->task = TSK_HEAD_OF_QUEUE;
+                        break;
+                case ORDERED_QUEUE_TAG:
+                        cmd_pkt->task = TSK_ORDERED;
+                        break;
+                }
+        }
+
         /* Load SCSI command packet. */
         memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len);
         host_to_fcp_swap(cmd_pkt->fcp_cdb, sizeof(cmd_pkt->fcp_cdb));