From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Alexander Gordeev <agordeev@redhat.com>, linux-kernel@vger.kernel.org
Cc: Ariel Elior <ariele@broadcom.com>,
netdev@vger.kernel.org, linux-pci@vger.kernel.org
Subject: Re: [PATCH 02/34] bnx2x: Use pci_enable_msix_range()
Date: Fri, 31 Jan 2014 22:11:59 +0300 [thread overview]
Message-ID: <52EBF57F.1060804@cogentembedded.com> (raw)
In-Reply-To: <911884c4e906af8acfa4c06ee3206387449f1d84.1391172839.git.agordeev@redhat.com>
Hello.
On 01/31/2014 06:08 PM, Alexander Gordeev wrote:
> As result of deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.
> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> ---
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 48 ++++++++++-------------
> 1 files changed, 21 insertions(+), 27 deletions(-)
> diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
> index 9d7419e..b396d74 100644
> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
> @@ -1638,24 +1638,36 @@ int bnx2x_enable_msix(struct bnx2x *bp)
> DP(BNX2X_MSG_SP, "about to request enable msix with %d vectors\n",
> msix_vec);
>
> - rc = pci_enable_msix(bp->pdev, &bp->msix_table[0], msix_vec);
> -
> + rc = pci_enable_msix_range(bp->pdev, &bp->msix_table[0],
> + BNX2X_MIN_MSIX_VEC_CNT(bp), msix_vec);
> /*
> * reconfigure number of tx/rx queues according to available
> * MSI-X vectors
> */
> - if (rc >= BNX2X_MIN_MSIX_VEC_CNT(bp)) {
> + if (rc < 0) {
> + BNX2X_DEV_INFO("MSI-X is not attainable rc %d\n", rc);
> + goto no_msix;
> + } else if (rc == -ENOSPC) {
This branch is unreachable now. You should have put this check first.
> + /* Get by with single vector */
> + rc = pci_enable_msix_range(bp->pdev, &bp->msix_table[0], 1, 1);
> + if (rc < 0) {
> + BNX2X_DEV_INFO("Single MSI-X is not attainable rc %d\n",
> + rc);
> + goto no_msix;
> + }
> +
> + BNX2X_DEV_INFO("Using single MSI-X vector\n");
> + bp->flags |= USING_SINGLE_MSIX_FLAG;
> +
> + BNX2X_DEV_INFO("set number of queues to 1\n");
> + bp->num_ethernet_queues = 1;
> + bp->num_queues = bp->num_ethernet_queues + bp->num_cnic_queues;
> + } else if (rc < msix_vec) {
WBR, Sergei
next prev parent reply other threads:[~2014-01-31 18:11 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1391172839.git.agordeev@redhat.com>
2014-01-31 15:08 ` [PATCH 01/34] bnx2: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 21:30 ` David Miller
2014-02-11 0:38 ` Bjorn Helgaas
2014-02-11 1:08 ` Bjorn Helgaas
2014-02-12 13:26 ` Alexander Gordeev
2014-02-12 17:00 ` Bjorn Helgaas
2014-02-12 18:08 ` Alexander Gordeev
2014-02-11 8:01 ` Alexander Gordeev
2014-01-31 15:08 ` [PATCH 02/34] bnx2x: " Alexander Gordeev
2014-01-31 19:11 ` Sergei Shtylyov [this message]
2014-01-31 15:08 ` [PATCH 03/34] tg3: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 04/34] bna: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 05/34] cxgb3: Remove superfluous call to pci_disable_msix() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 06/34] cxgb3: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 07/34] cxgb4: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 08/34] cxgb4vf: Remove superfluous call to pci_disable_msix() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 09/34] cxgb4vf: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 10/34] enic: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 11/34] benet: " Alexander Gordeev
2014-02-03 6:21 ` Sathya Perla
2014-01-31 15:08 ` [PATCH 12/34] e1000e: " Alexander Gordeev
2014-01-31 19:17 ` Sergei Shtylyov
2014-01-31 15:08 ` [PATCH 13/34] i40e: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 14/34] igb: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 15/34] igbvf: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 16/34] ixgbe: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 17/34] ixgbevf: " Alexander Gordeev
2014-01-31 19:20 ` Sergei Shtylyov
2014-01-31 15:08 ` [PATCH 18/34] mlx4: " Alexander Gordeev
2014-01-31 19:22 ` Sergei Shtylyov
2014-02-02 9:43 ` Amir Vadai
2014-01-31 15:08 ` [PATCH 19/34] mlx5: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 20/34] myri10ge: " Alexander Gordeev
2014-01-31 19:24 ` Sergei Shtylyov
2014-02-01 14:13 ` Hyong-Youb Kim
2014-01-31 15:08 ` [PATCH 21/34] s2io: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 22/34] vxge: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 23/34] forcedeth: Fix invalid errno reporting in nv_request_irq() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 24/34] forcedeth: Cleanup MSI-X to MSI to INTx fallback code Alexander Gordeev
2014-01-31 15:08 ` [PATCH 25/34] forcedeth: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 26/34] netxen: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 27/34] qlcnic: Cleanup qlcnic_enable_msix() return values Alexander Gordeev
2014-01-31 15:08 ` [PATCH 28/34] qlcnic: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 29/34] qlge: Get rid of an redundant assignment Alexander Gordeev
2014-01-31 15:08 ` [PATCH 30/34] qlge: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 31/34] efx: " Alexander Gordeev
2014-01-31 17:21 ` Shradha Shah
2014-01-31 15:08 ` [PATCH 32/34] niu: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 33/34] vmxnet3: Fix MSI-X/MSI enablement code Alexander Gordeev
2014-01-31 15:08 ` [PATCH 34/34] vmxnet3: Use pci_enable_msix_range() Alexander Gordeev
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=52EBF57F.1060804@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=agordeev@redhat.com \
--cc=ariele@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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