diff mbox

[dpdk-dev,v2] igb_uio: fix igb_uio's access to pci_dev->msi_list for kernels >= 4.3

Message ID 1446207257-31455-1-git-send-email-david.hunt@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Hunt, David Oct. 30, 2015, 12:14 p.m. UTC 
Fix to take this change into account: https://lkml.org/lkml/2015/7/9/101
Has been applied to Kernel 4.3.0-rc6

Linux: 4a7cc831 ("genirq/MSI: Move msi_list from struct pci_dev to
                struct device")

Signed-off-by: David Hunt <david.hunt@intel.com>
---
 lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

De Lara Guarch, Pablo Oct. 30, 2015, 12:30 p.m. UTC | #1 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of David Hunt
> Sent: Friday, October 30, 2015 12:14 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v2] igb_uio: fix igb_uio's access to pci_dev-
> >msi_list for kernels >= 4.3
> 
> Fix to take this change into account: https://lkml.org/lkml/2015/7/9/101
> Has been applied to Kernel 4.3.0-rc6
> 
> Linux: 4a7cc831 ("genirq/MSI: Move msi_list from struct pci_dev to
>                 struct device")
> 
> Signed-off-by: David Hunt <david.hunt@intel.com>

Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Thomas Monjalon Nov. 4, 2015, 11:07 p.m. UTC | #2 
> > Fix to take this change into account: https://lkml.org/lkml/2015/7/9/101
> > Has been applied to Kernel 4.3.0-rc6
> > 
> > Linux: 4a7cc831 ("genirq/MSI: Move msi_list from struct pci_dev to
> >                 struct device")
> > 
> > Signed-off-by: David Hunt <david.hunt@intel.com>
> 
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied, thanks
De Lara Guarch, Pablo Dec. 2, 2015, 3:05 p.m. UTC | #3 
Hi,

Sorry about the spam, I was testing my mail server and sent it accidentally to the mailing list.

Pablo

> -----Original Message-----

> From: De Lara Guarch, Pablo

> Sent: Wednesday, December 02, 2015 3:03 PM

> To: De Lara Guarch, Pablo; dev@dpdk.org

> Cc: David Hunfdsfst; Davidfsdf Hunt

> Subject: [dpdk-dev, v2] igb_uio: fix igb_uio's access to pci_dev->msi_list for

> kernels >= 4.3

> 

> From: David Hunfdsfst <fdfsddavid.hunt@intel.com>

> 

> Fix to take this change into account: https://lkml.org/lkml/2015/7/9/101

> Has been applied to Kernel 4.3.0-rc6

> 

> Linux: 4a7cc831 ("genirq/MSI: Move msi_list from struct pci_dev to

>                 struct device")

> 

> Signed-off-by: Davidfsdf Hunt <davfsdfsdid.hunt@intel.com>

> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

> 

> ---

> lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 5 +++++

>  1 file changed, 5 insertions(+)

> 

> diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c

> b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c

> index 3173e93..918861a 100644

> --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c

> +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c

> @@ -248,8 +248,13 @@ igbuio_pci_irqcontrol(struct uio_info *info, s32

> irq_state)

>  	else if (udev->mode == RTE_INTR_MODE_MSIX) {

>  		struct msi_desc *desc;

> 

> +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0))

>  		list_for_each_entry(desc, &pdev->msi_list, list)

>  			igbuio_msix_mask_irq(desc, irq_state);

> +#else

> +		list_for_each_entry(desc, &pdev->dev.msi_list, list)

> +			igbuio_msix_mask_irq(desc, irq_state);

> +#endif

>  	}

>  	pci_cfg_access_unlock(pdev);

>
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 3173e93..918861a 100644
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
@@ -248,8 +248,13 @@  igbuio_pci_irqcontrol(struct uio_info *info, s32 irq_state)
 	else if (udev->mode == RTE_INTR_MODE_MSIX) {
 		struct msi_desc *desc;
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0))
 		list_for_each_entry(desc, &pdev->msi_list, list)
 			igbuio_msix_mask_irq(desc, irq_state);
+#else
+		list_for_each_entry(desc, &pdev->dev.msi_list, list)
+			igbuio_msix_mask_irq(desc, irq_state);
+#endif
 	}
 	pci_cfg_access_unlock(pdev);