diff mbox

[dpdk-dev] igb_uio: switch to pci_alloc_irq_vectors()

Message ID 20170413145632.4214-1-nicolas.dichtel@6wind.com (mailing list archive)
State Superseded, archived
Headers

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation success Compilation OK

Commit Message

Nicolas Dichtel April 13, 2017, 2:56 p.m. UTC 
  pci_enable_msix() will be removed in kernel 4.12. The new API is available since
linux 4.8, thus let's use it.

Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=aff171641d18
Link: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git/commit/?id=4244de1c64de
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Reviewed-by: David Marchand <david.marchand@6wind.com>
---
 lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Ferruh Yigit April 19, 2017, 6:33 p.m. UTC | #1 
On 4/13/2017 3:56 PM, Nicolas Dichtel wrote:
> pci_enable_msix() will be removed in kernel 4.12. The new API is available since
> linux 4.8, thus let's use it.
> 
> Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=aff171641d18
> Link: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git/commit/?id=4244de1c64de
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> Reviewed-by: David Marchand <david.marchand@6wind.com>
> ---
>  lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
> index 192bd4a96b68..b50e0f8b0457 100644
> --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
> +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
> @@ -325,7 +325,9 @@ static int
>  igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
>  {
>  	struct rte_uio_pci_dev *udev;
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
>  	struct msix_entry msix_entry;
> +#endif
>  	dma_addr_t map_dma_addr;
>  	void *map_addr;
>  	int err;
> @@ -381,6 +383,7 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
>  	switch (igbuio_intr_mode_preferred) {
>  	case RTE_INTR_MODE_MSIX:
>  		/* Only 1 msi-x vector needed */
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)

Hi Nicolas,

Overall patch looks good, thanks.

Only can you please use compat.h for version check, instead of doing in
c file?

Thanks,
ferruh

>  		msix_entry.entry = 0;
>  		if (pci_enable_msix(dev, &msix_entry, 1) == 0) {
>  			dev_dbg(&dev->dev, "using MSI-X");
> @@ -389,6 +392,14 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
>  			udev->mode = RTE_INTR_MODE_MSIX;
>  			break;
>  		}
> +#else
> +		if (pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSIX) == 1) {
> +			dev_dbg(&dev->dev, "using MSI-X");
> +			udev->info.irq = pci_irq_vector(dev, 0);
> +			udev->mode = RTE_INTR_MODE_MSIX;
> +			break;
> +		}
> +#endif
>  		/* fall back to INTX */
>  	case RTE_INTR_MODE_LEGACY:
>  		if (pci_intx_mask_supported(dev)) {
>
diff mbox

Patch

diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
index 192bd4a96b68..b50e0f8b0457 100644
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
@@ -325,7 +325,9 @@  static int
 igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
 	struct rte_uio_pci_dev *udev;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
 	struct msix_entry msix_entry;
+#endif
 	dma_addr_t map_dma_addr;
 	void *map_addr;
 	int err;
@@ -381,6 +383,7 @@  igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 	switch (igbuio_intr_mode_preferred) {
 	case RTE_INTR_MODE_MSIX:
 		/* Only 1 msi-x vector needed */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
 		msix_entry.entry = 0;
 		if (pci_enable_msix(dev, &msix_entry, 1) == 0) {
 			dev_dbg(&dev->dev, "using MSI-X");
@@ -389,6 +392,14 @@  igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 			udev->mode = RTE_INTR_MODE_MSIX;
 			break;
 		}
+#else
+		if (pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSIX) == 1) {
+			dev_dbg(&dev->dev, "using MSI-X");
+			udev->info.irq = pci_irq_vector(dev, 0);
+			udev->mode = RTE_INTR_MODE_MSIX;
+			break;
+		}
+#endif
 		/* fall back to INTX */
 	case RTE_INTR_MODE_LEGACY:
 		if (pci_intx_mask_supported(dev)) {