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

Commit b7edfa23 authored by Michael Hernandez's avatar Michael Hernandez Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix target multiqueue configuration 



Following error will be logged in to message file while trying to
configure target with multiqueue.

"Cmd 0x1f aborted with timeout since ISP Abort is pending"
"qla25xx_init_queues Rsp que: 1 init failed."

Fixes: 82de802a ("scsi: qla2xxx: Preparation for Target MQ.")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarMichael Hernandez <michael.hernandez@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6e98095f

drivers/scsi/qla2xxx/qla_isr.c

+1 −1
Original line number Diff line number Diff line
@@ -3454,7 +3454,7 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) 
	}



	/* Enable MSI-X vector for response queue update for queue 0 */

	if (IS_QLA25XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha)) {

	if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {

		if (ha->msixbase && ha->mqiobase &&

		    (ha->max_rsp_queues > 1 || ha->max_req_queues > 1 ||

		     ql2xmqsupport))

drivers/scsi/qla2xxx/qla_mbx.c

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static struct rom_cmd { 
	{ MBC_GET_MEM_OFFLOAD_CNTRL_STAT },

	{ MBC_GET_RETRY_COUNT },

	{ MBC_TRACE_CONTROL },

	{ MBC_INITIALIZE_MULTIQ },

};



static int is_rom_cmd(uint16_t cmd)

drivers/scsi/qla2xxx/qla_target.c

+1 −1
Original line number Diff line number Diff line
@@ -6796,7 +6796,7 @@ qlt_probe_one_stage1(struct scsi_qla_host *base_vha, struct qla_hw_data *ha) 
	if (!QLA_TGT_MODE_ENABLED())

		return;



	if  (ha->mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha)) {

	if  (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {

		ISP_ATIO_Q_IN(base_vha) = &ha->mqiobase->isp25mq.atio_q_in;

		ISP_ATIO_Q_OUT(base_vha) = &ha->mqiobase->isp25mq.atio_q_out;

	} else {