| Message ID | d21563117d14900b2c094847198ff9a99e2e3dfa.1394128952.git.agordeev@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
> From: Alexander Gordeev [mailto:agordeev@redhat.com] > Sent: Thursday, March 06, 2014 3:11 PM > To: linux-kernel@vger.kernel.org > Cc: Alexander Gordeev; Matt Porter; Bounine, Alexandre; linux- > pci@vger.kernel.org > Subject: [PATCH v2 RESEND 3/4] tsi721: Use pci_enable_msix_exact() > instead of pci_enable_msix() > > 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() or pci_enable_msi_exact() > and pci_enable_msix_range() or pci_enable_msix_exact() > interfaces. Acked-by: Alexandre Bounine <alexandre.bounine@idt.com> Andrew, please pick up this patch for the -next tree. > > Signed-off-by: Alexander Gordeev <agordeev@redhat.com> > Cc: Matt Porter <mporter@kernel.crashing.org> > Cc: Alexandre Bounine <alexandre.bounine@idt.com> > Cc: linux-pci@vger.kernel.org > --- > drivers/rapidio/devices/tsi721.c | 11 +++-------- > 1 files changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/rapidio/devices/tsi721.c > b/drivers/rapidio/devices/tsi721.c > index ff7cbf2..ce08e8d 100644 > --- a/drivers/rapidio/devices/tsi721.c > +++ b/drivers/rapidio/devices/tsi721.c > @@ -768,15 +768,10 @@ static int tsi721_enable_msix(struct > tsi721_device *priv) > } > #endif /* CONFIG_RAPIDIO_DMA_ENGINE */ > > - err = pci_enable_msix(priv->pdev, entries, ARRAY_SIZE(entries)); > + err = pci_enable_msix_exact(priv->pdev, entries, > ARRAY_SIZE(entries)); > if (err) { > - if (err > 0) > - dev_info(&priv->pdev->dev, > - "Only %d MSI-X vectors available, " > - "not using MSI-X\n", err); > - else > - dev_err(&priv->pdev->dev, > - "Failed to enable MSI-X (err=%d)\n", err); > + dev_err(&priv->pdev->dev, > + "Failed to enable MSI-X (err=%d)\n", err); > return err; > } > > -- > 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 07, 2014 at 01:35:34PM +0000, Bounine, Alexandre wrote: > > From: Alexander Gordeev [mailto:agordeev@redhat.com] > > Sent: Thursday, March 06, 2014 3:11 PM > > To: linux-kernel@vger.kernel.org > > Cc: Alexander Gordeev; Matt Porter; Bounine, Alexandre; linux- > > pci@vger.kernel.org > > Subject: [PATCH v2 RESEND 3/4] tsi721: Use pci_enable_msix_exact() > > instead of pci_enable_msix() > > > > 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() or pci_enable_msi_exact() > > and pci_enable_msix_range() or pci_enable_msix_exact() > > interfaces. > > > Acked-by: Alexandre Bounine <alexandre.bounine@idt.com> > > Andrew, please pick up this patch for the -next tree. Hi Andrew, Could you please pick up this patch? Thanks! > > Signed-off-by: Alexander Gordeev <agordeev@redhat.com> > > Cc: Matt Porter <mporter@kernel.crashing.org> > > Cc: Alexandre Bounine <alexandre.bounine@idt.com> > > Cc: linux-pci@vger.kernel.org > > --- > > drivers/rapidio/devices/tsi721.c | 11 +++-------- > > 1 files changed, 3 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/rapidio/devices/tsi721.c > > b/drivers/rapidio/devices/tsi721.c > > index ff7cbf2..ce08e8d 100644 > > --- a/drivers/rapidio/devices/tsi721.c > > +++ b/drivers/rapidio/devices/tsi721.c > > @@ -768,15 +768,10 @@ static int tsi721_enable_msix(struct > > tsi721_device *priv) > > } > > #endif /* CONFIG_RAPIDIO_DMA_ENGINE */ > > > > - err = pci_enable_msix(priv->pdev, entries, ARRAY_SIZE(entries)); > > + err = pci_enable_msix_exact(priv->pdev, entries, > > ARRAY_SIZE(entries)); > > if (err) { > > - if (err > 0) > > - dev_info(&priv->pdev->dev, > > - "Only %d MSI-X vectors available, " > > - "not using MSI-X\n", err); > > - else > > - dev_err(&priv->pdev->dev, > > - "Failed to enable MSI-X (err=%d)\n", err); > > + dev_err(&priv->pdev->dev, > > + "Failed to enable MSI-X (err=%d)\n", err); > > return err; > > } > > > > -- > > 1.7.7.6 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c index ff7cbf2..ce08e8d 100644 --- a/drivers/rapidio/devices/tsi721.c +++ b/drivers/rapidio/devices/tsi721.c @@ -768,15 +768,10 @@ static int tsi721_enable_msix(struct tsi721_device *priv) } #endif /* CONFIG_RAPIDIO_DMA_ENGINE */ - err = pci_enable_msix(priv->pdev, entries, ARRAY_SIZE(entries)); + err = pci_enable_msix_exact(priv->pdev, entries, ARRAY_SIZE(entries)); if (err) { - if (err > 0) - dev_info(&priv->pdev->dev, - "Only %d MSI-X vectors available, " - "not using MSI-X\n", err); - else - dev_err(&priv->pdev->dev, - "Failed to enable MSI-X (err=%d)\n", err); + dev_err(&priv->pdev->dev, + "Failed to enable MSI-X (err=%d)\n", err); return err; }
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() or pci_enable_msi_exact() and pci_enable_msix_range() or pci_enable_msix_exact() interfaces. Signed-off-by: Alexander Gordeev <agordeev@redhat.com> Cc: Matt Porter <mporter@kernel.crashing.org> Cc: Alexandre Bounine <alexandre.bounine@idt.com> Cc: linux-pci@vger.kernel.org --- drivers/rapidio/devices/tsi721.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-)