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

net/cnxk: fix hotplug detach for first device

Browse Source 
Fix hotplug detach sequence to handle case where first PCI
device that is hosting NPA LF is being destroyed while in use.

Fixes: 5a4341c84979 ("net/cnxk: add platform specific probe and remove")
Cc: stable@dpdk.org

Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
This commit is contained in:
Nithin Dabilpuram 2022-05-08 13:18:38 +05:30 committed by Jerin Jacob
parent e2819fea94
commit 14124e48a3
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/cnxk/cn10k_ethdev.c
View File

@ -783,8 +783,12 @@ cn10k_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
/* Find eth dev allocated */
eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
if (!eth_dev)
if (!eth_dev) {
/* Ignore if ethdev is in mid of detach state in secondary */
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
return -ENOENT;
}
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
/* Setup callbacks for secondary process */

6
drivers/net/cnxk/cn9k_ethdev.c
View File

@ -713,8 +713,12 @@ cn9k_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
/* Find eth dev allocated */
eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
if (!eth_dev)
if (!eth_dev) {
/* Ignore if ethdev is in mid of detach state in secondary */
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
return -ENOENT;
}
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
/* Setup callbacks for secondary process */

8
drivers/net/cnxk/cnxk_ethdev.c
View File

@ -1781,9 +1781,6 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset)
struct rte_eth_fc_conf fc_conf;
int rc, i;
/* Disable switch hdr pkind */
roc_nix_switch_hdr_set(&dev->nix, 0, 0, 0, 0);
plt_free(eth_dev->security_ctx);
eth_dev->security_ctx = NULL;
@ -1791,6 +1788,9 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset)
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
/* Disable switch hdr pkind */
roc_nix_switch_hdr_set(&dev->nix, 0, 0, 0, 0);
/* Clear the flag since we are closing down */
dev->configured = 0;
@ -1927,7 +1927,7 @@ cnxk_nix_remove(struct rte_pci_device *pci_dev)
/* Check if this device is hosting common resource */
nix = roc_idev_npa_nix_get();
if (nix->pci_dev != pci_dev)
if (!nix || nix->pci_dev != pci_dev)
return 0;
/* Try nix fini now */