From: Tomas Henzl <thenzl@redhat.com>
To: Sasikumar Chandrasekaran <sasikumar.pc@broadcom.com>,
jejb@kernel.org, hch@infradead.org
Cc: linux-scsi@vger.kernel.org, Sathya.Prakash@broadcom.com,
linux-kernel@vger.kernel.org, christopher.owens@broadcom.com,
kiran-kumar.kasturi@broadcom.com
Subject: Re: [PATCH V4 02/11] megaraid_sas: 128 MSIX Support
Date: Thu, 8 Dec 2016 16:34:59 +0100 [thread overview]
Message-ID: <ece66d1c-473a-5c20-1ee5-c01a3d25d375@redhat.com> (raw)
In-Reply-To: <1481065220-18431-3-git-send-email-sasikumar.pc@broadcom.com>
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 <sasikumar.pc@broadcom.com>
> ---
> 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]);
next prev parent reply other threads:[~2016-12-08 15:35 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-06 23:00 [PATCH V4 00/11] megaraid_sas: Updates for scsi-next Sasikumar Chandrasekaran
2016-12-06 23:00 ` [PATCH V4 01/11] megaraid_sas: Add new pci device Ids for SAS3.5 Generic Megaraid Controllers Sasikumar Chandrasekaran
2016-12-08 15:17 ` Tomas Henzl
2016-12-06 23:00 ` [PATCH V4 02/11] megaraid_sas: 128 MSIX Support Sasikumar Chandrasekaran
2016-12-08 15:34 ` Tomas Henzl [this message]
2016-12-14 21:43 ` Sasikumar PC
2016-12-20 1:50 ` Sasikumar PC
2016-12-20 14:16 ` Tomas Henzl
2016-12-06 23:00 ` [PATCH V4 03/11] megaraid_sas: EEDP Escape Mode Support for SAS3.5 Generic Megaraid Controllers Sasikumar Chandrasekaran
2016-12-08 15:35 ` Tomas Henzl
2016-12-06 23:00 ` [PATCH V4 04/11] megaraid_sas: SAS3.5 Generic Megaraid Controllers Stream Detection and IO Coalescing Sasikumar Chandrasekaran
2016-12-08 16:00 ` Tomas Henzl
2016-12-12 16:38 ` Tomas Henzl
2016-12-14 22:07 ` Sasikumar PC
2016-12-06 23:00 ` [PATCH V4 05/11] megaraid_sas: SAS3.5 Generic Megaraid Controllers Fast Path for RAID 1/10 Writes Sasikumar Chandrasekaran
2016-12-09 10:54 ` Tomas Henzl
2016-12-06 23:00 ` [PATCH V4 06/11] megaraid_sas: Dynamic Raid Map Changes for SAS3.5 Generic Megaraid Controllers Sasikumar Chandrasekaran
2016-12-09 12:55 ` Tomas Henzl
2016-12-14 21:49 ` Sasikumar PC
2016-12-20 1:51 ` Sasikumar PC
2016-12-20 14:20 ` Tomas Henzl
2016-12-20 14:22 ` Sasikumar PC
2016-12-06 23:00 ` [PATCH V4 07/11] megaraid_sas: Add the Support for SAS3.5 Generic Megaraid Controllers Capabilities Sasikumar Chandrasekaran
2016-12-09 13:05 ` Tomas Henzl
2016-12-09 13:13 ` Tomas Henzl
2016-12-14 21:52 ` Sasikumar PC
2016-12-06 23:00 ` [PATCH V4 08/11] megaraid_sas: Enable or Disable Fast path based on the PCI Threshold Bandwidth Sasikumar Chandrasekaran
2016-12-09 13:58 ` Tomas Henzl
2016-12-14 21:54 ` Sasikumar PC
2016-12-15 15:10 ` Tomas Henzl
2016-12-20 1:51 ` Sasikumar PC
2016-12-20 15:12 ` Tomas Henzl
2016-12-06 23:00 ` [PATCH V4 09/11] megaraid_sas: ldio_outstanding variable is not decremented in completion path Sasikumar Chandrasekaran
2016-12-09 14:01 ` Tomas Henzl
2016-12-06 23:00 ` [PATCH V4 10/11] megaraid_sas: Implement the PD Map support for SAS3.5 Generic Megaraid Controllers Sasikumar Chandrasekaran
2016-12-09 14:07 ` Tomas Henzl
2016-12-06 23:00 ` [PATCH V4 11/11] megaraid_sas: driver version upgrade Sasikumar Chandrasekaran
2016-12-09 14:07 ` Tomas Henzl
2016-12-07 7:31 ` [PATCH V4 00/11] megaraid_sas: Updates for scsi-next Christoph Hellwig
2016-12-11 14:04 ` Sasikumar PC
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ece66d1c-473a-5c20-1ee5-c01a3d25d375@redhat.com \
--to=thenzl@redhat.com \
--cc=Sathya.Prakash@broadcom.com \
--cc=christopher.owens@broadcom.com \
--cc=hch@infradead.org \
--cc=jejb@kernel.org \
--cc=kiran-kumar.kasturi@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=sasikumar.pc@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).