d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e1000: fix PCI device info with secondary process

Browse Source 
This fixes a bug added to em and igb drivers 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.

Fixes: eeefe73f0af1 ("drivers: copy PCI device info to ethdev data")

Signed-off-by: Jon DeVree <nuxi@vault24.org>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
This commit is contained in:
Jon DeVree 2015-11-23 10:13:53 -05:00 committed by Thomas Monjalon
parent d082c0395b
commit 1be847dd45
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/e1000/em_ethdev.c
View File

@ -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;

4
drivers/net/e1000/igb_ethdev.c
View File

@ -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);