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

drivers/net: fix device configuration

Browse Source 
dev_flags is wrongly overwritten with RTE_ETH_DEV_DETACHABLE value
in drivers after rte_eth_copy_pci_info().

Previous values of the dev_flags set in rte_eth_copy_pci_info(),
like RTE_ETH_DEV_INTR_LSC, are get lost. That will fail the device
configuration.

Fix by preventing dev_flags overwritten.

Fixes: 22dda618c00c ("pci: separate detaching ethernet ports from PCI devices")

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Signed-off-by: Jeff Guo <jia.guo@intel.com>
This commit is contained in:
Jeff Guo 2017-02-08 17:50:16 +08:00 committed by Ferruh Yigit
parent 47c6782344
commit 45f4dd1adc
9 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/bnxt/bnxt_ethdev.c
View File

@ -1087,7 +1087,8 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
RTE_LOG(INFO, PMD, "%s", bnxt_version); RTE_LOG(INFO, PMD, "%s", bnxt_version);
rte_eth_copy_pci_info(eth_dev, pci_dev); rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; eth_dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
bp = eth_dev->data->dev_private; bp = eth_dev->data->dev_private;
if (bnxt_vf_pciid(pci_dev->id.device_id)) if (bnxt_vf_pciid(pci_dev->id.device_id))

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

@ -339,7 +339,7 @@ eth_em_dev_init(struct rte_eth_dev *eth_dev)
} }
rte_eth_copy_pci_info(eth_dev, pci_dev); rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; eth_dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
hw->hw_addr = (void *)pci_dev->mem_resource[0].addr; hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
hw->device_id = pci_dev->id.device_id; hw->device_id = pci_dev->id.device_id;

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

@ -777,7 +777,7 @@ eth_igb_dev_init(struct rte_eth_dev *eth_dev)
} }
rte_eth_copy_pci_info(eth_dev, pci_dev); rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; eth_dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
hw->hw_addr= (void *)pci_dev->mem_resource[0].addr; hw->hw_addr= (void *)pci_dev->mem_resource[0].addr;
@ -986,7 +986,7 @@ eth_igbvf_dev_init(struct rte_eth_dev *eth_dev)
pci_dev = E1000_DEV_TO_PCI(eth_dev); pci_dev = E1000_DEV_TO_PCI(eth_dev);
rte_eth_copy_pci_info(eth_dev, pci_dev); rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; eth_dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
hw->device_id = pci_dev->id.device_id; hw->device_id = pci_dev->id.device_id;
hw->vendor_id = pci_dev->id.vendor_id; hw->vendor_id = pci_dev->id.vendor_id;

2
drivers/net/fm10k/fm10k_ethdev.c
View File

@ -2858,7 +2858,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
return 0; return 0;
rte_eth_copy_pci_info(dev, pdev); rte_eth_copy_pci_info(dev, pdev);
dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private); macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);
memset(macvlan, 0, sizeof(*macvlan)); memset(macvlan, 0, sizeof(*macvlan));

2
drivers/net/i40e/i40e_ethdev.c
View File

@ -1045,7 +1045,7 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
intr_handle = &pci_dev->intr_handle; intr_handle = &pci_dev->intr_handle;
rte_eth_copy_pci_info(dev, pci_dev); rte_eth_copy_pci_info(dev, pci_dev);
dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
pf->adapter = I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); pf->adapter = I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
pf->adapter->eth_dev = dev; pf->adapter->eth_dev = dev;

2
drivers/net/i40e/i40e_ethdev_vf.c
View File

@ -1478,7 +1478,7 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
} }
rte_eth_copy_pci_info(eth_dev, pci_dev); rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; eth_dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
hw->vendor_id = pci_dev->id.vendor_id; hw->vendor_id = pci_dev->id.vendor_id;
hw->device_id = pci_dev->id.device_id; hw->device_id = pci_dev->id.device_id;

4
drivers/net/ixgbe/ixgbe_ethdev.c
View File

@ -1173,7 +1173,7 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev)
} }
rte_eth_copy_pci_info(eth_dev, pci_dev); rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; eth_dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
/* Vendor and Device ID need to be set before init of shared code */ /* Vendor and Device ID need to be set before init of shared code */
hw->device_id = pci_dev->id.device_id; hw->device_id = pci_dev->id.device_id;
@ -1627,7 +1627,7 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
} }
rte_eth_copy_pci_info(eth_dev, pci_dev); rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; eth_dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
hw->device_id = pci_dev->id.device_id; hw->device_id = pci_dev->id.device_id;
hw->vendor_id = pci_dev->id.vendor_id; hw->vendor_id = pci_dev->id.vendor_id;

2
drivers/net/nfp/nfp_net.c
View File

@ -2465,7 +2465,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
pci_dev = RTE_DEV_TO_PCI(eth_dev->device); pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
rte_eth_copy_pci_info(eth_dev, pci_dev); rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; eth_dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
hw->device_id = pci_dev->id.device_id; hw->device_id = pci_dev->id.device_id;
hw->vendor_id = pci_dev->id.vendor_id; hw->vendor_id = pci_dev->id.vendor_id;

2
drivers/net/vmxnet3/vmxnet3_ethdev.c
View File

@ -250,7 +250,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
return 0; return 0;
rte_eth_copy_pci_info(eth_dev, pci_dev); rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE; eth_dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
/* Vendor and Device ID need to be set before init of shared code */ /* Vendor and Device ID need to be set before init of shared code */
hw->device_id = pci_dev->id.device_id; hw->device_id = pci_dev->id.device_id;