Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753632AbcLHPfE (ORCPT ); Thu, 8 Dec 2016 10:35:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37850 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751593AbcLHPfD (ORCPT ); Thu, 8 Dec 2016 10:35:03 -0500 Subject: Re: [PATCH V4 02/11] megaraid_sas: 128 MSIX Support To: Sasikumar Chandrasekaran , jejb@kernel.org, hch@infradead.org References: <1481065220-18431-1-git-send-email-sasikumar.pc@broadcom.com> <1481065220-18431-3-git-send-email-sasikumar.pc@broadcom.com> Cc: linux-scsi@vger.kernel.org, Sathya.Prakash@broadcom.com, linux-kernel@vger.kernel.org, christopher.owens@broadcom.com, kiran-kumar.kasturi@broadcom.com From: Tomas Henzl Message-ID: Date: Thu, 8 Dec 2016 16:34:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <1481065220-18431-3-git-send-email-sasikumar.pc@broadcom.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 08 Dec 2016 15:35:02 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4006 Lines: 104 On 7.12.2016 00:00, Sasikumar Chandrasekaran wrote: > SAS3.5 Generic Megaraid based Controllers will have the support for 128 MSI-X vectors, > resulting in the need to support 128 reply queues > > This patch is depending on patch 1 > > Signed-off-by: Sasikumar Chandrasekaran > --- > drivers/scsi/megaraid/megaraid_sas.h | 1 + > drivers/scsi/megaraid/megaraid_sas_base.c | 24 +++++++++++++++++------- > drivers/scsi/megaraid/megaraid_sas_fusion.c | 4 ++-- > 3 files changed, 20 insertions(+), 9 deletions(-) > > diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h > index 72e16c2..9d4ca8d 100644 > --- a/drivers/scsi/megaraid/megaraid_sas.h > +++ b/drivers/scsi/megaraid/megaraid_sas.h > @@ -2149,6 +2149,7 @@ struct megasas_instance { > bool dev_handle; > bool fw_sync_cache_support; > bool is_ventura; > + bool msix_combined; > }; > struct MR_LD_VF_MAP { > u32 size; > diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c > index efccf98..c583e0b 100644 > --- a/drivers/scsi/megaraid/megaraid_sas_base.c > +++ b/drivers/scsi/megaraid/megaraid_sas_base.c > @@ -5086,13 +5086,7 @@ static int megasas_init_fw(struct megasas_instance *instance) > goto fail_ready_state; > } > > - /* > - * MSI-X host index 0 is common for all adapter. > - * It is used for all MPT based Adapters. > - */ > - instance->reply_post_host_index_addr[0] = > - (u32 __iomem *)((u8 __iomem *)instance->reg_set + > - MPI2_REPLY_POST_HOST_INDEX_OFFSET); > + > > /* Check if MSI-X is supported while in ready state */ > msix_enable = (instance->instancet->read_fw_status_reg(reg_set) & > @@ -5110,6 +5104,9 @@ static int megasas_init_fw(struct megasas_instance *instance) > 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; > + > if (rdpq_enable) > instance->is_rdpq = (scratch_pad_2 & MR_RDPQ_MODE_OFFSET) ? > 1 : 0; > @@ -5143,6 +5140,19 @@ static int megasas_init_fw(struct megasas_instance *instance) > else > instance->msix_vectors = 0; > } Have you tested this patch with the pci=nomsi kernel option? is it safe when msix_combined is true and pci_enable_msix_range fails so instance->msix_vectors is zero? tomash > + /* > + * MSI-X host index 0 is common for all adapter. > + * It is used for all MPT based Adapters. > + */ > + if (instance->msix_combined) { > + instance->reply_post_host_index_addr[0] = > + (u32 *)((u8 *)instance->reg_set + > + MPI2_SUP_REPLY_POST_HOST_INDEX_OFFSET); > + } else { > + instance->reply_post_host_index_addr[0] = > + (u32 *)((u8 *)instance->reg_set + > + MPI2_REPLY_POST_HOST_INDEX_OFFSET); > + } > > dev_info(&instance->pdev->dev, > "firmware supports msix\t: (%d)", fw_msix_count); > diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c > index 8d7a397..413e2030 100644 > --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c > +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c > @@ -2391,7 +2391,7 @@ static void megasas_build_ld_nonrw_fusion(struct megasas_instance *instance, > * pending to be completed > */ > if (threshold_reply_count >= THRESHOLD_REPLY_COUNT) { > - if (fusion->adapter_type == INVADER_SERIES) > + if (instance->msix_combined) > writel(((MSIxIndex & 0x7) << 24) | > fusion->last_reply_idx[MSIxIndex], > instance->reply_post_host_index_addr[MSIxIndex/8]); > @@ -2407,7 +2407,7 @@ static void megasas_build_ld_nonrw_fusion(struct megasas_instance *instance, > return IRQ_NONE; > > wmb(); > - if (fusion->adapter_type == INVADER_SERIES) > + if (instance->msix_combined) > writel(((MSIxIndex & 0x7) << 24) | > fusion->last_reply_idx[MSIxIndex], > instance->reply_post_host_index_addr[MSIxIndex/8]);