From: Shradha Shah <sshah@solarflare.com>
To: Alexander Gordeev <agordeev@redhat.com>
Cc: <linux-kernel@vger.kernel.org>,
Solarflare maintainers <linux-net-drivers@solarflare.com>,
<netdev@vger.kernel.org>, <linux-pci@vger.kernel.org>
Subject: Re: [PATCH 31/34] efx: Use pci_enable_msix_range()
Date: Fri, 31 Jan 2014 17:21:59 +0000 [thread overview]
Message-ID: <52EBDBB7.9010503@solarflare.com> (raw)
In-Reply-To: <433fe68f834c10679986274f4bb605aa4ed5eaf3.1391172839.git.agordeev@redhat.com>
On 01/31/2014 03: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>
Acked-by: Shradha Shah <sshah@solarflare.com>
> ---
> drivers/net/ethernet/sfc/efx.c | 20 +++++++++-----------
> 1 files changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
> index 83d4643..297b97a 100644
> --- a/drivers/net/ethernet/sfc/efx.c
> +++ b/drivers/net/ethernet/sfc/efx.c
> @@ -1346,20 +1346,23 @@ static int efx_probe_interrupts(struct efx_nic *efx)
>
> for (i = 0; i < n_channels; i++)
> xentries[i].entry = i;
> - rc = pci_enable_msix(efx->pci_dev, xentries, n_channels);
> - if (rc > 0) {
> + rc = pci_enable_msix_range(efx->pci_dev,
> + xentries, 1, n_channels);
> + if (rc < 0) {
> + /* Fall back to single channel MSI */
> + efx->interrupt_mode = EFX_INT_MODE_MSI;
> + netif_err(efx, drv, efx->net_dev,
> + "could not enable MSI-X\n");
> + } else if (rc < n_channels) {
> netif_err(efx, drv, efx->net_dev,
> "WARNING: Insufficient MSI-X vectors"
> " available (%d < %u).\n", rc, n_channels);
> netif_err(efx, drv, efx->net_dev,
> "WARNING: Performance may be reduced.\n");
> - EFX_BUG_ON_PARANOID(rc >= n_channels);
> n_channels = rc;
> - rc = pci_enable_msix(efx->pci_dev, xentries,
> - n_channels);
> }
>
> - if (rc == 0) {
> + if (rc > 0) {
> efx->n_channels = n_channels;
> if (n_channels > extra_channels)
> n_channels -= extra_channels;
> @@ -1375,11 +1378,6 @@ static int efx_probe_interrupts(struct efx_nic *efx)
> for (i = 0; i < efx->n_channels; i++)
> efx_get_channel(efx, i)->irq =
> xentries[i].vector;
> - } else {
> - /* Fall back to single channel MSI */
> - efx->interrupt_mode = EFX_INT_MODE_MSI;
> - netif_err(efx, drv, efx->net_dev,
> - "could not enable MSI-X\n");
> }
> }
>
>
next prev parent reply other threads:[~2014-01-31 17:21 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-31 15:46 [PATCH 00/34] net: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 01/34] bnx2: " 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-11 8:01 ` Alexander Gordeev
2014-01-31 15:08 ` [PATCH 02/34] bnx2x: " Alexander Gordeev
2014-01-31 19:11 ` Sergei Shtylyov
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 [this message]
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=52EBDBB7.9010503@solarflare.com \
--to=sshah@solarflare.com \
--cc=agordeev@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-net-drivers@solarflare.com \
--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;
as well as URLs for NNTP newsgroup(s).