igb_uio: fix igb_uio's access to pci_dev->msi_list for kernels >= 4.3

PATCH Applied David Hunt 3 participants 4 messages Oct 30, 2015 – Dec 2, 2015

lore

Share & tools

lore

David Hunt

author

2015-10-30 12:14 UTC #0 lore raw

PATCH v2 1/1 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 <[email protected]>

---
 lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 5 +++++
 1 file changed, 5 insertions(+)

lib/librte_eal/linuxapp/igb_uio/igb_uio.c +5 -0

index 3173e93..918861a 100644
@@ -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);

Signature · 1 line

1.9.1

De Lara Guarch, Pablo

Acked-by on v2 1/1

2015-10-30 12:30 UTC #1 lore raw

Quoted 9 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of David Hunt
Sent: Friday, October 30, 2015 12:14 PM
To: [email protected]
Subject: [dpdk-dev] [PATCH v2] igb_uio: fix igb_uio's access to pci_dev-
Quoted 1 line
msi_list for kernels >= 4.3

Quoted 7 lines

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 <[email protected]>

Acked-by Pablo de Lara <[email protected]>

Thomas Monjalon

Applied

2015-11-04 23:09 UTC #2 lore raw

Quoted 9 lines

Quoted 7 lines
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 <[email protected]>
Acked-by Pablo de Lara <[email protected]>

Applied, thanks

De Lara Guarch, Pablo

2015-12-02 15:05 UTC #3 lore raw

In reply to David Hunt

Hi,

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

Pablo

Quoted 43 lines

-----Original Message-----
From: De Lara Guarch, Pablo
Sent: Wednesday, December 02, 2015 3:03 PM
To: De Lara Guarch, Pablo; [email protected]
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 <[email protected]>
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 <[email protected]>
Acked-by Pablo de Lara <[email protected]>
---
lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 5 +++++
 1 file changed, 5 insertions(+)
lib/librte_eal/linuxapp/igb_uio/igb_uio.c +5 -0
index 3173e93..918861a 100644
@@ -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);