Skip to contentSkip to conversation

pci: fix non-Intel devices probing

PATCH Superseded Thomas Monjalon 4 participants 10 messages Sep 16, 2013 – Sep 17, 2013 5 messages not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pci: fix non-Intel devices probing

From: David Marchand <[email protected]>

There is no need to check for bars mapping, especially BAR0 is not required. If bars mapping failed, then pci_uio_map_resource will fail and we won't reach this check. So get rid of BAR0 check.
Besides, pci_uio_map_resource should only be called for Intel devices. The flag RTE_PCI_DRV_NEED_IGB_UIO is set for all Intel devices, even when RTE_EAL_UNBIND_PORTS is disabled.

---
 app/test/test_pci.c                     |    2 --
 lib/librte_eal/common/include/rte_pci.h |    2 --
 lib/librte_eal/linuxapp/eal/eal_pci.c   |   30 +++++++-----------------------
 lib/librte_pmd_e1000/em_ethdev.c        |    2 --
 lib/librte_pmd_e1000/igb_ethdev.c       |    4 ----
 lib/librte_pmd_ixgbe/ixgbe_ethdev.c     |    4 ----
 6 files changed, 7 insertions(+), 37 deletions(-)
app/test/test_pci.c +0 -2
index 30d3c9f..55f603d 100644
@@ -95,9 +95,7 @@ struct rte_pci_driver my_driver = {
 	.name = "test_driver",
 	.devinit = my_driver_init,
 	.id_table = my_driver_id,
-#ifdef RTE_EAL_UNBIND_PORTS
 	.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 };
 
 struct rte_pci_driver my_driver2 = {
lib/librte_eal/common/include/rte_pci.h +0 -2
index c3ff5b9..affaae0 100644
@@ -184,10 +184,8 @@ struct rte_pci_driver {
 	uint32_t drv_flags;                     /**< Flags contolling handling of device. */
 };
 
-#ifdef RTE_EAL_UNBIND_PORTS
 /** Device needs igb_uio kernel module */
 #define RTE_PCI_DRV_NEED_IGB_UIO 0x0001
-#endif
 /** Device driver must be registered several times until failure */
 #define RTE_PCI_DRV_MULTIPLE 0x0002
 /** Device needs to be unbound even if no module is provided */
lib/librte_eal/linuxapp/eal/eal_pci.c +7 -23
index eeb6cd7..998d5ba 100644
@@ -913,13 +913,6 @@ int
 rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev)
 {
 	struct rte_pci_id *id_table;
-#ifdef RTE_EAL_UNBIND_PORTS
-	const char *module_name = NULL;
-	int uio_status = -1;
-
-	if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
-		module_name = IGB_UIO_NAME;
-#endif
 
 	for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
 
@@ -953,10 +946,10 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
 		}
 
 #ifdef RTE_EAL_UNBIND_PORTS
-		/* Unbind PCI devices if needed */
-		if (module_name != NULL)
+		/* Unbind Intel devices and load uio ressources */
+		if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
 		{
-			if (pci_switch_module(dr, dev, uio_status, module_name) < 0)
+			if (pci_switch_module(dr, dev, 1, IGB_UIO_NAME) < 0)
 				return -1;
 		}
 		else if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND &&
@@ -966,21 +959,12 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
 				return -1;
 		}
 #else
-		/* just map the NIC resources */
-		if (pci_uio_map_resource(dev) < 0)
-			return -1;
+		/* just map the NIC resources for Intel devices */
+		if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
+			if (pci_uio_map_resource(dev) < 0)
+				return -1;
 #endif
 
-		/* We always should have BAR0 mapped */
-		if (!(dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND) &&
-		    (rte_eal_process_type() == RTE_PROC_PRIMARY) &&
-		    dev->mem_resource[0].addr == NULL) {
-			RTE_LOG(ERR, EAL,
-				"%s(): BAR0 is not mapped\n",
-				__func__);
-			return (-1);
-		}
- 
 		/* reference driver structure */
 		dev->driver = dr;
 
lib/librte_pmd_e1000/em_ethdev.c +0 -2
index fc63557..4fccc1d 100644
@@ -280,9 +280,7 @@ static struct eth_driver rte_em_pmd = {
 	{
 		.name = "rte_em_pmd",
 		.id_table = pci_id_em_map,
-#ifdef RTE_EAL_UNBIND_PORTS
 		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 	},
 	.eth_dev_init = eth_em_dev_init,
 	.dev_private_size = sizeof(struct e1000_adapter),
lib/librte_pmd_e1000/igb_ethdev.c +0 -4
index 85835f7..c4cdae9 100644
@@ -522,9 +522,7 @@ static struct eth_driver rte_igb_pmd = {
 	{
 		.name = "rte_igb_pmd",
 		.id_table = pci_id_igb_map,
-#ifdef RTE_EAL_UNBIND_PORTS
 		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 	},
 	.eth_dev_init = eth_igb_dev_init,
 	.dev_private_size = sizeof(struct e1000_adapter),
@@ -537,9 +535,7 @@ static struct eth_driver rte_igbvf_pmd = {
 	{
 		.name = "rte_igbvf_pmd",
 		.id_table = pci_id_igbvf_map,
-#ifdef RTE_EAL_UNBIND_PORTS
 		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 	},
 	.eth_dev_init = eth_igbvf_dev_init,
 	.dev_private_size = sizeof(struct e1000_adapter),
lib/librte_pmd_ixgbe/ixgbe_ethdev.c +0 -4
index 516fed4..9235f9d 100644
@@ -807,9 +807,7 @@ static struct eth_driver rte_ixgbe_pmd = {
 	{
 		.name = "rte_ixgbe_pmd",
 		.id_table = pci_id_ixgbe_map,
-#ifdef RTE_EAL_UNBIND_PORTS
 		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 	},
 	.eth_dev_init = eth_ixgbe_dev_init,
 	.dev_private_size = sizeof(struct ixgbe_adapter),
@@ -822,9 +820,7 @@ static struct eth_driver rte_ixgbevf_pmd = {
 	{
 		.name = "rte_ixgbevf_pmd",
 		.id_table = pci_id_ixgbevf_map,
-#ifdef RTE_EAL_UNBIND_PORTS
 		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 	},
 	.eth_dev_init = eth_ixgbevf_dev_init,
 	.dev_private_size = sizeof(struct ixgbe_adapter),
Signature · 1 line
1.7.10.4

A message that is not in the archive (sent off-list or not yet received): 1379363340-20870-1-git-send-email-thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org

#2 lore raw
Quoted 6 lines

There is no need to check for bars mapping, especially BAR0 is not required. If bars mapping failed, then pci_uio_map_resource will fail and we won't reach this check. So get rid of BAR0 check.
Besides, pci_uio_map_resource should only be called for Intel devices. The flag RTE_PCI_DRV_NEED_IGB_UIO is set for all Intel devices, even when RTE_EAL_UNBIND_PORTS is disabled.

Addendum:
This patch is needed to run virtio-net-pmd and vmxnet3-usermap with DPDK 1.4.

#3 lore raw
In reply to a message not in the archive

I totally disagree with this statement. I am currently working on a non-intel device that does need UIO support (I copied the igb UIO to create a new UIO driver). This device not only needs bar0 but also bar1. I've modified the eal PCI support code to support this behavior and change this behavior would not be good, IMHO.

Patrick

Coming to you from deep inside Fortress Mahan

Quoted 171 lines · Thomas Monjalon

From: David Marchand <[email protected]>

There is no need to check for bars mapping, especially BAR0 is not required. If bars mapping failed, then pci_uio_map_resource will fail and we won't reach this check. So get rid of BAR0 check.
Besides, pci_uio_map_resource should only be called for Intel devices. The flag RTE_PCI_DRV_NEED_IGB_UIO is set for all Intel devices, even when RTE_EAL_UNBIND_PORTS is disabled.

---

app/test/test_pci.c                     |    2 --
lib/librte_eal/common/include/rte_pci.h |    2 --
lib/librte_eal/linuxapp/eal/eal_pci.c   |   30 +++++++-----------------------
lib/librte_pmd_e1000/em_ethdev.c        |    2 --
lib/librte_pmd_e1000/igb_ethdev.c       |    4 ----
lib/librte_pmd_ixgbe/ixgbe_ethdev.c     |    4 ----
6 files changed, 7 insertions(+), 37 deletions(-)
app/test/test_pci.c +0 -2
index 30d3c9f..55f603d 100644
@@ -95,9 +95,7 @@ struct rte_pci_driver my_driver = {
   .name = "test_driver",
   .devinit = my_driver_init,
   .id_table = my_driver_id,
-#ifdef RTE_EAL_UNBIND_PORTS
   .drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 };
 
 struct rte_pci_driver my_driver2 = {
lib/librte_eal/common/include/rte_pci.h +0 -2
index c3ff5b9..affaae0 100644
@@ -184,10 +184,8 @@ struct rte_pci_driver {
   uint32_t drv_flags;                     /**< Flags contolling handling of device. */
 };
 
-#ifdef RTE_EAL_UNBIND_PORTS
 /** Device needs igb_uio kernel module */
 #define RTE_PCI_DRV_NEED_IGB_UIO 0x0001
-#endif
 /** Device driver must be registered several times until failure */
 #define RTE_PCI_DRV_MULTIPLE 0x0002
 /** Device needs to be unbound even if no module is provided */
lib/librte_eal/linuxapp/eal/eal_pci.c +7 -23
index eeb6cd7..998d5ba 100644
@@ -913,13 +913,6 @@ int
 rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev)
 {
   struct rte_pci_id *id_table;
-#ifdef RTE_EAL_UNBIND_PORTS
-    const char *module_name = NULL;
-    int uio_status = -1;
-
-    if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
-        module_name = IGB_UIO_NAME;
-#endif
 
   for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
 
@@ -953,10 +946,10 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
       }
 
 #ifdef RTE_EAL_UNBIND_PORTS
-        /* Unbind PCI devices if needed */
-        if (module_name != NULL)
+        /* Unbind Intel devices and load uio ressources */
+        if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
       {
-            if (pci_switch_module(dr, dev, uio_status, module_name) < 0)
+            if (pci_switch_module(dr, dev, 1, IGB_UIO_NAME) < 0)
               return -1;
       }
       else if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND &&
@@ -966,21 +959,12 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
               return -1;
       }
 #else
-        /* just map the NIC resources */
-        if (pci_uio_map_resource(dev) < 0)
-            return -1;
+        /* just map the NIC resources for Intel devices */
+        if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
+            if (pci_uio_map_resource(dev) < 0)
+                return -1;
 #endif
 
-        /* We always should have BAR0 mapped */
-        if (!(dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND) &&
-            (rte_eal_process_type() == RTE_PROC_PRIMARY) &&
-            dev->mem_resource[0].addr == NULL) {
-            RTE_LOG(ERR, EAL,
-                "%s(): BAR0 is not mapped\n",
-                __func__);
-            return (-1);
-        }
- 
       /* reference driver structure */
       dev->driver = dr;
 
lib/librte_pmd_e1000/em_ethdev.c +0 -2
index fc63557..4fccc1d 100644
@@ -280,9 +280,7 @@ static struct eth_driver rte_em_pmd = {
   {
       .name = "rte_em_pmd",
       .id_table = pci_id_em_map,
-#ifdef RTE_EAL_UNBIND_PORTS
       .drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
   },
   .eth_dev_init = eth_em_dev_init,
   .dev_private_size = sizeof(struct e1000_adapter),
lib/librte_pmd_e1000/igb_ethdev.c +0 -4
index 85835f7..c4cdae9 100644
@@ -522,9 +522,7 @@ static struct eth_driver rte_igb_pmd = {
   {
       .name = "rte_igb_pmd",
       .id_table = pci_id_igb_map,
-#ifdef RTE_EAL_UNBIND_PORTS
       .drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
   },
   .eth_dev_init = eth_igb_dev_init,
   .dev_private_size = sizeof(struct e1000_adapter),
@@ -537,9 +535,7 @@ static struct eth_driver rte_igbvf_pmd = {
   {
       .name = "rte_igbvf_pmd",
       .id_table = pci_id_igbvf_map,
-#ifdef RTE_EAL_UNBIND_PORTS
       .drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
   },
   .eth_dev_init = eth_igbvf_dev_init,
   .dev_private_size = sizeof(struct e1000_adapter),
lib/librte_pmd_ixgbe/ixgbe_ethdev.c +0 -4
index 516fed4..9235f9d 100644
@@ -807,9 +807,7 @@ static struct eth_driver rte_ixgbe_pmd = {
   {
       .name = "rte_ixgbe_pmd",
       .id_table = pci_id_ixgbe_map,
-#ifdef RTE_EAL_UNBIND_PORTS
       .drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
   },
   .eth_dev_init = eth_ixgbe_dev_init,
   .dev_private_size = sizeof(struct ixgbe_adapter),
@@ -822,9 +820,7 @@ static struct eth_driver rte_ixgbevf_pmd = {
   {
       .name = "rte_ixgbevf_pmd",
       .id_table = pci_id_ixgbevf_map,
-#ifdef RTE_EAL_UNBIND_PORTS
       .drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
   },
   .eth_dev_init = eth_ixgbevf_dev_init,
   .dev_private_size = sizeof(struct ixgbe_adapter),
Signature · 1 line
1.7.10.4

A message that is not in the archive (sent off-list or not yet received): BBFDF6C2-16DE-413B-8A68-DA85A68774DE-5dHXHCkEAVbYtjvyW6yDsg@public.gmane.org

#5 lore raw

16/09/2013 14:42, Patrick Mahan :

Quoted 1 line

On Sep 16, 2013, at 1:29 PM, Thomas Monjalon <[email protected]>

Quoted 7 lines · wrote:
Quoted 6 lines

There is no need to check for bars mapping, especially BAR0 is not required. If bars mapping failed, then pci_uio_map_resource will fail and we won't reach this check. So get rid of BAR0 check.
Besides, pci_uio_map_resource should only be called for Intel devices. The flag RTE_PCI_DRV_NEED_IGB_UIO is set for all Intel devices, even when RTE_EAL_UNBIND_PORTS is disabled.

Quoted 5 lines

I totally disagree with this statement. I am currently working on a non-intel device that does need UIO support (I copied the igb UIO to create a new UIO driver). This device not only needs bar0 but also bar1. I've modified the eal PCI support code to support this behavior and change this behavior would not be good, IMHO.

I don't know which statement you are talking about.
You are writing a PMD based on UIO. Will you send it on dpdk.org ? In this release, the only PMDs using UIO are Intel ones.
Also as explained, this check is never needed.
But I think you are talking about support of BAR mapping. This is not changed by this patch. Moreover, the BAR mapping is extended in coming release 1.4.1.

Note that it's simpler to discuss about a patch or a clearly pointed sentence. So, please be more precise or send your patch proposal.

PS: please don't top-post

Signature · 1 line
Thomas
#6 lore raw

I agree with Thomas, the check is not needed.
After this all settles out, I have a patch to add support for I/O resource tracking in base DPDK. It makes it easier to do the right thing in drivers that need to use I/O instead of memory.

#7 lore raw

v2 cover fix non-Intel devices probing

In reply to a message not in the archive

This new version split the patch and improve some comments.

These patches will be included in the coming release 1.4.1r1. They are needed to load vmxnet3-usermap and virtio-net-pmd with DPDK 1.4.

---

David Marchand (1):
pci: do not check BAR0 mapping

Thomas Monjalon (1):
pci: use igb_uio mapping only when needed

 app/test/test_pci.c                     |    2 --
 lib/librte_eal/common/include/rte_pci.h |    2 --
 lib/librte_eal/linuxapp/eal/eal_pci.c   |   29 +++++++----------------------
 lib/librte_pmd_e1000/em_ethdev.c        |    2 --
 lib/librte_pmd_e1000/igb_ethdev.c       |    4 ----
 lib/librte_pmd_ixgbe/ixgbe_ethdev.c     |    4 ----
 6 files changed, 7 insertions(+), 36 deletions(-)
Signature · 1 line
1.7.10.4

A message that is not in the archive (sent off-list or not yet received): cover.1379413101.git.thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org

#9 lore raw

PATCH v2 1/2 pci: do not check BAR0 mapping

From: David Marchand <[email protected]>

Since DPDK 1.4, bars mapping is checked and prevent from initializing drivers which do not use igb_uio mapping.
There is no need to check for bars mapping, especially BAR0 is not required. If bars mapping failed, then pci_uio_map_resource will fail and we won't reach this check. So get rid of BAR0 check.

---
 lib/librte_eal/linuxapp/eal/eal_pci.c |    9 ---------
 1 file changed, 9 deletions(-)
lib/librte_eal/linuxapp/eal/eal_pci.c +0 -9
index 5c7f814..3913c65 100644
@@ -963,15 +963,6 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
 			return -1;
 #endif
 
-		/* We always should have BAR0 mapped */
-		if (rte_eal_process_type() == RTE_PROC_PRIMARY && 
-			dev->mem_resource[0].addr == NULL) {
-			RTE_LOG(ERR, EAL,
-				"%s(): BAR0 is not mapped\n",
-				__func__);
-			return (-1);
-		}
- 
 		/* reference driver structure */
 		dev->driver = dr;
 
Signature · 1 line
1.7.10.4

A message that is not in the archive (sent off-list or not yet received): 6d68788d4315a3c2e13e244b0658429334df2572.1379413101.git.thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org

#11 lore raw

Re: [PATCH v2 1/2] pci: do not check BAR0 mapping

Quoted 10 lines · Thomas Monjalon

From: David Marchand <[email protected]>

Since DPDK 1.4, bars mapping is checked and prevent from initializing drivers which do not use igb_uio mapping.
There is no need to check for bars mapping, especially BAR0 is not required. If bars mapping failed, then pci_uio_map_resource will fail and we won't reach this check. So get rid of BAR0 check.

#12 lore raw

PATCH v2 2/2 pci: use igb_uio mapping only when needed

In reply to a message not in the archive

pci_uio_map_resource() should only be called for Intel devices (using igb_uio kernel module).
The flag RTE_PCI_DRV_NEED_IGB_UIO is set for all those devices, even when RTE_EAL_UNBIND_PORTS is disabled.

---
 app/test/test_pci.c                     |    2 --
 lib/librte_eal/common/include/rte_pci.h |    2 --
 lib/librte_eal/linuxapp/eal/eal_pci.c   |   20 +++++++-------------
 lib/librte_pmd_e1000/em_ethdev.c        |    2 --
 lib/librte_pmd_e1000/igb_ethdev.c       |    4 ----
 lib/librte_pmd_ixgbe/ixgbe_ethdev.c     |    4 ----
 6 files changed, 7 insertions(+), 27 deletions(-)
app/test/test_pci.c +0 -2
index 30d3c9f..55f603d 100644
@@ -95,9 +95,7 @@ struct rte_pci_driver my_driver = {
 	.name = "test_driver",
 	.devinit = my_driver_init,
 	.id_table = my_driver_id,
-#ifdef RTE_EAL_UNBIND_PORTS
 	.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 };
 
 struct rte_pci_driver my_driver2 = {
lib/librte_eal/common/include/rte_pci.h +0 -2
index 1314d20..3cfce1b 100644
@@ -184,10 +184,8 @@ struct rte_pci_driver {
 	uint32_t drv_flags;                     /**< Flags contolling handling of device. */
 };
 
-#ifdef RTE_EAL_UNBIND_PORTS
 /** Device needs igb_uio kernel module */
 #define RTE_PCI_DRV_NEED_IGB_UIO 0x0001
-#endif
 /** Device driver must be registered several times until failure */
 #define RTE_PCI_DRV_MULTIPLE 0x0002
 
lib/librte_eal/linuxapp/eal/eal_pci.c +7 -13
index 3913c65..ec6a7e2 100644
@@ -913,13 +913,6 @@ int
 rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev)
 {
 	struct rte_pci_id *id_table;
-#ifdef RTE_EAL_UNBIND_PORTS
-	const char *module_name = NULL;
-	int uio_status = -1;
-
-	if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
-		module_name = IGB_UIO_NAME;
-#endif
 
 	for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
 
@@ -953,14 +946,15 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
 		}
 
 #ifdef RTE_EAL_UNBIND_PORTS
-		/* Unbind PCI devices if needed */
-		if (module_name != NULL)
-			if (pci_switch_module(dr, dev, uio_status, module_name) < 0)
+		if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
+			/* unbind driver and load uio resources for Intel NICs */
+			if (pci_switch_module(dr, dev, 1, IGB_UIO_NAME) < 0)
 				return -1;
 #else
-		/* just map the NIC resources */
-		if (pci_uio_map_resource(dev) < 0)
-			return -1;
+		if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
+			/* just map resources for Intel NICs */
+			if (pci_uio_map_resource(dev) < 0)
+				return -1;
 #endif
 
 		/* reference driver structure */
lib/librte_pmd_e1000/em_ethdev.c +0 -2
index 9c6ff20..103c9cf 100644
@@ -280,9 +280,7 @@ static struct eth_driver rte_em_pmd = {
 	{
 		.name = "rte_em_pmd",
 		.id_table = pci_id_em_map,
-#ifdef RTE_EAL_UNBIND_PORTS
 		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 	},
 	.eth_dev_init = eth_em_dev_init,
 	.dev_private_size = sizeof(struct e1000_adapter),
lib/librte_pmd_e1000/igb_ethdev.c +0 -4
index 14bdc2b..89709f6 100644
@@ -522,9 +522,7 @@ static struct eth_driver rte_igb_pmd = {
 	{
 		.name = "rte_igb_pmd",
 		.id_table = pci_id_igb_map,
-#ifdef RTE_EAL_UNBIND_PORTS
 		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 	},
 	.eth_dev_init = eth_igb_dev_init,
 	.dev_private_size = sizeof(struct e1000_adapter),
@@ -537,9 +535,7 @@ static struct eth_driver rte_igbvf_pmd = {
 	{
 		.name = "rte_igbvf_pmd",
 		.id_table = pci_id_igbvf_map,
-#ifdef RTE_EAL_UNBIND_PORTS
 		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 	},
 	.eth_dev_init = eth_igbvf_dev_init,
 	.dev_private_size = sizeof(struct e1000_adapter),
lib/librte_pmd_ixgbe/ixgbe_ethdev.c +0 -4
index e26d5b9..d90cd92 100644
@@ -807,9 +807,7 @@ static struct eth_driver rte_ixgbe_pmd = {
 	{
 		.name = "rte_ixgbe_pmd",
 		.id_table = pci_id_ixgbe_map,
-#ifdef RTE_EAL_UNBIND_PORTS
 		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 	},
 	.eth_dev_init = eth_ixgbe_dev_init,
 	.dev_private_size = sizeof(struct ixgbe_adapter),
@@ -822,9 +820,7 @@ static struct eth_driver rte_ixgbevf_pmd = {
 	{
 		.name = "rte_ixgbevf_pmd",
 		.id_table = pci_id_ixgbevf_map,
-#ifdef RTE_EAL_UNBIND_PORTS
 		.drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
-#endif
 	},
 	.eth_dev_init = eth_ixgbevf_dev_init,
 	.dev_private_size = sizeof(struct ixgbe_adapter),
Signature · 1 line
1.7.10.4

A message that is not in the archive (sent off-list or not yet received): 82132fea875815a5569d5138b2531eabf6545090.1379413101.git.thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org