mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
scsi: qla2xxx: Turn off multi-queue for 8G adapters
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: Quinn Tran <qutran@marvell.com> Signed-off-by: Nilesh Javali <njavali@marvell.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
d3117c83ba
commit
5304673bdb
2 changed files with 8 additions and 12 deletions
|
@ -4273,8 +4273,8 @@ struct qla_hw_data {
|
||||||
#define IS_OEM_001(ha) ((ha)->device_type & DT_OEM_001)
|
#define IS_OEM_001(ha) ((ha)->device_type & DT_OEM_001)
|
||||||
#define HAS_EXTENDED_IDS(ha) ((ha)->device_type & DT_EXTENDED_IDS)
|
#define HAS_EXTENDED_IDS(ha) ((ha)->device_type & DT_EXTENDED_IDS)
|
||||||
#define IS_CT6_SUPPORTED(ha) ((ha)->device_type & DT_CT6_SUPPORTED)
|
#define IS_CT6_SUPPORTED(ha) ((ha)->device_type & DT_CT6_SUPPORTED)
|
||||||
#define IS_MQUE_CAPABLE(ha) ((ha)->mqenable || IS_QLA83XX(ha) || \
|
#define IS_MQUE_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha) || \
|
||||||
IS_QLA27XX(ha) || IS_QLA28XX(ha))
|
IS_QLA28XX(ha))
|
||||||
#define IS_BIDI_CAPABLE(ha) \
|
#define IS_BIDI_CAPABLE(ha) \
|
||||||
(IS_QLA25XX(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))
|
(IS_QLA25XX(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))
|
||||||
/* Bit 21 of fw_attributes decides the MCTP capabilities */
|
/* Bit 21 of fw_attributes decides the MCTP capabilities */
|
||||||
|
|
|
@ -4430,16 +4430,12 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Enable MSI-X vector for response queue update for queue 0 */
|
/* Enable MSI-X vector for response queue update for queue 0 */
|
||||||
if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) {
|
if (IS_MQUE_CAPABLE(ha) &&
|
||||||
if (ha->msixbase && ha->mqiobase &&
|
(ha->msixbase && ha->mqiobase && ha->max_qpairs))
|
||||||
(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))
|
|
||||||
ha->mqenable = 1;
|
ha->mqenable = 1;
|
||||||
|
else
|
||||||
|
ha->mqenable = 0;
|
||||||
|
|
||||||
ql_dbg(ql_dbg_multiq, vha, 0xc005,
|
ql_dbg(ql_dbg_multiq, vha, 0xc005,
|
||||||
"mqiobase=%p, max_rsp_queues=%d, max_req_queues=%d.\n",
|
"mqiobase=%p, max_rsp_queues=%d, max_req_queues=%d.\n",
|
||||||
ha->mqiobase, ha->max_rsp_queues, ha->max_req_queues);
|
ha->mqiobase, ha->max_rsp_queues, ha->max_req_queues);
|
||||||
|
|
Loading…
Reference in a new issue