Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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=59601



Reported-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

drivers/scsi/qla2xxx/qla_iocb.c

+9 −2
Original line number Diff line number Diff line
@@ -419,6 +419,8 @@ qla2x00_start_scsi(srb_t *sp) 
			    __constant_cpu_to_le16(CF_SIMPLE_TAG);

			break;

		}

	} else {

		cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG);

	}



	/* Load SCSI command packet. */
@@ -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;

		    break;

		default:

		    fcp_cmnd->task_attribute = 0;

		    fcp_cmnd->task_attribute = TSK_SIMPLE;

		    break;

		}

	} 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 */
@@ -1525,7 +1527,12 @@ qla24xx_start_scsi(srb_t *sp) 
		case ORDERED_QUEUE_TAG:

			cmd_pkt->task = TSK_ORDERED;

			break;

		default:

		    cmd_pkt->task = TSK_SIMPLE;

		    break;

		}

	} else {

		cmd_pkt->task = TSK_SIMPLE;

	}



	/* Load SCSI command packet. */