From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 196A65A69 for ; Fri, 30 Oct 2015 13:14:27 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 30 Oct 2015 05:14:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,218,1444719600"; d="scan'208";a="838800117" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 30 Oct 2015 05:14:26 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t9UCEPQZ003867; Fri, 30 Oct 2015 12:14:25 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id t9UCEPPf031496; Fri, 30 Oct 2015 12:14:25 GMT Received: (from dhunt5@localhost) by sivswdev02.ir.intel.com with id t9UCEPjC031492; Fri, 30 Oct 2015 12:14:25 GMT From: David Hunt To: dev@dpdk.org Date: Fri, 30 Oct 2015 12:14:17 +0000 Message-Id: <1446207257-31455-1-git-send-email-david.hunt@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH v2] igb_uio: fix igb_uio's access to pci_dev->msi_list for kernels >= 4.3 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Oct 2015 12:14:28 -0000 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 --- 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); -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id C1FE38D86 for ; Wed, 2 Dec 2015 16:03:04 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 02 Dec 2015 07:02:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,373,1444719600"; d="scan'208";a="852320733" Received: from sie-lab-214-036.ir.intel.com (HELO sie-lab-214-174.ir.intel.com) ([10.237.214.36]) by fmsmga001.fm.intel.com with ESMTP; 02 Dec 2015 07:02:38 -0800 From: Pablo de Lara To: pablo.de.lara.guarch@intel.com, dev@dpdk.org Date: Wed, 2 Dec 2015 15:02:36 +0000 Message-Id: <1446207257-31455-1-git-send-email-david.hunt@intel.com> X-Mailer: git-send-email 2.5.0 Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 X-Patchwork-Id: 8370 Content-Transfer-Encoding: 7bit Cc: Davidfsdf Hunt , David Hunfdsfst Subject: [dpdk-dev] [dpdk-dev, v2] igb_uio: fix igb_uio's access to pci_dev->msi_list for kernels >= 4.3 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2015 15:03:05 -0000 Message-ID: <20151202150236.Ak9t9NryCaqrXCGhu6f_RyaYaTq9IphEA_4JCpmtW7M@z> From: David Hunfdsfst 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 Acked-by: Pablo de Lara --- 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);