lkml.org 
[lkml]   [2019]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 069/190] scsi: megaraid_sas: Fix combined reply queue mode detection
    Date
    [ Upstream commit e29c322133472628c6de85efb99ccd3b3df5571e ]

    For Invader series, if FW supports more than 8 MSI-x vectors, driver needs
    to enable combined reply queue mode. For Ventura series, driver enables
    combined reply queue mode in case of more than 16 MSI-x vectors.

    Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com>
    Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/megaraid/megaraid_sas_base.c | 23 ++++++++++++++++++++---
    1 file changed, 20 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
    index 806ceabcabc3f..b6fc7c6337610 100644
    --- a/drivers/scsi/megaraid/megaraid_sas_base.c
    +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
    @@ -5325,12 +5325,29 @@ static int megasas_init_fw(struct megasas_instance *instance)
    instance->msix_vectors = (scratch_pad_2
    & MR_MAX_REPLY_QUEUES_OFFSET) + 1;
    fw_msix_count = instance->msix_vectors;
    - } else { /* Invader series supports more than 8 MSI-x vectors*/
    + } else {
    instance->msix_vectors = ((scratch_pad_2
    & MR_MAX_REPLY_QUEUES_EXT_OFFSET)
    >> MR_MAX_REPLY_QUEUES_EXT_OFFSET_SHIFT) + 1;
    - if (instance->msix_vectors > 16)
    - instance->msix_combined = true;
    +
    + /*
    + * For Invader series, > 8 MSI-x vectors
    + * supported by FW/HW implies combined
    + * reply queue mode is enabled.
    + * For Ventura series, > 16 MSI-x vectors
    + * supported by FW/HW implies combined
    + * reply queue mode is enabled.
    + */
    + switch (instance->adapter_type) {
    + case INVADER_SERIES:
    + if (instance->msix_vectors > 8)
    + instance->msix_combined = true;
    + break;
    + case VENTURA_SERIES:
    + if (instance->msix_vectors > 16)
    + instance->msix_combined = true;
    + break;
    + }

    if (rdpq_enable)
    instance->is_rdpq = (scratch_pad_2 & MR_RDPQ_MODE_OFFSET) ?
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-09-13 15:31    [W:2.334 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site