Commit c3ccb1d7 authored by Saurav Kashyap's avatar Saurav Kashyap Committed by James Bottomley

[SCSI] qla2xxx: Properly set the tagging for commands.

This fixes a regression where Xyratex controllers and disks were lost by the
driver:

https://bugzilla.kernel.org/show_bug.cgi?id=59601Reported-by: default avatarJack Hill <jackhill@jackhill.us>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@qlogic.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 96f15f29
...@@ -419,6 +419,8 @@ qla2x00_start_scsi(srb_t *sp) ...@@ -419,6 +419,8 @@ qla2x00_start_scsi(srb_t *sp)
__constant_cpu_to_le16(CF_SIMPLE_TAG); __constant_cpu_to_le16(CF_SIMPLE_TAG);
break; break;
} }
} else {
cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG);
} }
/* Load SCSI command packet. */ /* Load SCSI command packet. */
...@@ -1307,11 +1309,11 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt, ...@@ -1307,11 +1309,11 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
fcp_cmnd->task_attribute = TSK_ORDERED; fcp_cmnd->task_attribute = TSK_ORDERED;
break; break;
default: default:
fcp_cmnd->task_attribute = 0; fcp_cmnd->task_attribute = TSK_SIMPLE;
break; break;
} }
} else { } else {
fcp_cmnd->task_attribute = 0; fcp_cmnd->task_attribute = TSK_SIMPLE;
} }
cmd_pkt->fcp_rsp_dseg_len = 0; /* Let response come in status iocb */ cmd_pkt->fcp_rsp_dseg_len = 0; /* Let response come in status iocb */
...@@ -1525,7 +1527,12 @@ qla24xx_start_scsi(srb_t *sp) ...@@ -1525,7 +1527,12 @@ qla24xx_start_scsi(srb_t *sp)
case ORDERED_QUEUE_TAG: case ORDERED_QUEUE_TAG:
cmd_pkt->task = TSK_ORDERED; cmd_pkt->task = TSK_ORDERED;
break; break;
default:
cmd_pkt->task = TSK_SIMPLE;
break;
} }
} else {
cmd_pkt->task = TSK_SIMPLE;
} }
/* Load SCSI command packet. */ /* Load SCSI command packet. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment