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

Commit d2e82c78 authored by Quinn Tran's avatar Quinn Tran Committed by Greg Kroah-Hartman
Browse files

scsi: qla2xxx: Turn off multi-queue for 8G adapters 

commit 5304673bdb1635e27555bd636fd5d6956f1cd552 upstream.

For 8G adapters, multi-queue was enabled accidentally. Make sure
multi-queue is not enabled.

Link: https://lore.kernel.org/r/20220616053508.27186-5-njavali@marvell.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarQuinn Tran <qutran@marvell.com>
Signed-off-by: default avatarNilesh Javali <njavali@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83cb0fb8

drivers/scsi/qla2xxx/qla_def.h

+2 −2
Original line number Diff line number Diff line
@@ -3899,8 +3899,8 @@ struct qla_hw_data { 
#define IS_OEM_001(ha)          ((ha)->device_type & DT_OEM_001)

#define HAS_EXTENDED_IDS(ha)    ((ha)->device_type & DT_EXTENDED_IDS)

#define IS_CT6_SUPPORTED(ha)	((ha)->device_type & DT_CT6_SUPPORTED)

#define IS_MQUE_CAPABLE(ha)	((ha)->mqenable || IS_QLA83XX(ha) || \

				IS_QLA27XX(ha) || IS_QLA28XX(ha))

#define IS_MQUE_CAPABLE(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha) || \

				 IS_QLA28XX(ha))

#define IS_BIDI_CAPABLE(ha) \

    (IS_QLA25XX(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))

/* Bit 21 of fw_attributes decides the MCTP capabilities */

drivers/scsi/qla2xxx/qla_isr.c

+6 −10
Original line number Diff line number Diff line
@@ -3568,16 +3568,12 @@ 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_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {

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

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

		     ql2xmqsupport))

			ha->mqenable = 1;

	} else

		if (ha->mqiobase &&

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

		     ql2xmqsupport))

	if (IS_MQUE_CAPABLE(ha) &&

	    (ha->msixbase && ha->mqiobase && ha->max_qpairs))

		ha->mqenable = 1;

	else

		ha->mqenable = 0;



	ql_dbg(ql_dbg_multiq, vha, 0xc005,

	    "mqiobase=%p, max_rsp_queues=%d, max_req_queues=%d.\n",

	    ha->mqiobase, ha->max_rsp_queues, ha->max_req_queues);