[dpdk-dev] [PATCH] igb/e1000: Copy PCI device info after the rte_eal_process_type() check

[dpdk-dev] [PATCH] igb/e1000: Copy PCI device info after the rte_eal_process_type() check

[Jon DeVree]

This fixes a bug added to these two drivers by eeefe73 (drivers: copy
PCI device info to ethdev data) which causes the pci info seen by the
primary process to become invalidated by secondary process startup.
This call was added after the process type check in the other drivers.

Signed-off-by: Jon DeVree <nuxi@vault24.org>
---
 drivers/net/e1000/em_ethdev.c  | 4 ++--
 drivers/net/e1000/igb_ethdev.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 3e81109..66e8993 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -244,8 +244,6 @@ eth_em_dev_init(struct rte_eth_dev *eth_dev)
 
 	pci_dev = eth_dev->pci_dev;
 
-	rte_eth_copy_pci_info(eth_dev, pci_dev);
-
 	eth_dev->dev_ops = &eth_em_ops;
 	eth_dev->rx_pkt_burst = (eth_rx_burst_t)&eth_em_recv_pkts;
 	eth_dev->tx_pkt_burst = (eth_tx_burst_t)&eth_em_xmit_pkts;
@@ -260,6 +258,8 @@ eth_em_dev_init(struct rte_eth_dev *eth_dev)
 		return 0;
 	}
 
+	rte_eth_copy_pci_info(eth_dev, pci_dev);
+
 	hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
 	hw->device_id = pci_dev->id.device_id;
 	adapter->stopped = 0;
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 88995b0..0dc6357 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -647,8 +647,6 @@ eth_igb_dev_init(struct rte_eth_dev *eth_dev)
 
 	pci_dev = eth_dev->pci_dev;
 
-	rte_eth_copy_pci_info(eth_dev, pci_dev);
-
 	eth_dev->dev_ops = &eth_igb_ops;
 	eth_dev->rx_pkt_burst = &eth_igb_recv_pkts;
 	eth_dev->tx_pkt_burst = &eth_igb_xmit_pkts;
@@ -662,6 +660,8 @@ eth_igb_dev_init(struct rte_eth_dev *eth_dev)
 		return 0;
 	}
 
+	rte_eth_copy_pci_info(eth_dev, pci_dev);
+
 	hw->hw_addr= (void *)pci_dev->mem_resource[0].addr;
 
 	igb_identify_hardware(eth_dev);
-- 
2.6.2

Re: [dpdk-dev] [PATCH] igb/e1000: Copy PCI device info after the rte_eal_process_type() check

[Iremonger, Bernard]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Jon DeVree
> Sent: Monday, November 23, 2015 3:14 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] igb/e1000: Copy PCI device info after the
> rte_eal_process_type() check
> 
> This fixes a bug added to these two drivers by eeefe73 (drivers: copy PCI
> device info to ethdev data) which causes the pci info seen by the primary
> process to become invalidated by secondary process startup.
> This call was added after the process type check in the other drivers.
> 
> Signed-off-by: Jon DeVree <nuxi@vault24.org>

Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>

Re: [dpdk-dev] [PATCH] igb/e1000: Copy PCI device info after the rte_eal_process_type() check

[Thomas Monjalon]

> > This fixes a bug added to these two drivers by eeefe73 (drivers: copy PCI
> > device info to ethdev data) which causes the pci info seen by the primary
> > process to become invalidated by secondary process startup.
> > This call was added after the process type check in the other drivers.
> > 
> > Signed-off-by: Jon DeVree <nuxi@vault24.org>
> 
> Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>

Applied, thanks.