lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 1037/1157] scsi: qla2xxx: Turn off multi-queue for 8G adapters
    Date
    From: Quinn Tran <qutran@marvell.com>

    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: Quinn Tran <qutran@marvell.com>
    Signed-off-by: Nilesh Javali <njavali@marvell.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/scsi/qla2xxx/qla_def.h | 4 ++--
    drivers/scsi/qla2xxx/qla_isr.c | 16 ++++++----------
    2 files changed, 8 insertions(+), 12 deletions(-)

    --- a/drivers/scsi/qla2xxx/qla_def.h
    +++ b/drivers/scsi/qla2xxx/qla_def.h
    @@ -4264,8 +4264,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 */
    --- a/drivers/scsi/qla2xxx/qla_isr.c
    +++ b/drivers/scsi/qla2xxx/qla_isr.c
    @@ -4419,16 +4419,12 @@ msix_register_fail:
    }

    /* 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))
    - ha->mqenable = 1;
    + 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);

    \
     
     \ /
      Last update: 2022-08-16 02:54    [W:2.145 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site