net/cnxk: fix hotplug detach for first device

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>

diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c
index 7c70202bfe03a15411bbba025166d7734e789c7b..4cd82af7e59c49cb92ddcc4fcb65c6e3a8dff4bc 100644 (file)
--- a/drivers/net/cnxk/cn10k_ethdev.c
+++ b/drivers/net/cnxk/cn10k_ethdev.c
@@ -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 */

diff --git a/drivers/net/cnxk/cn9k_ethdev.c b/drivers/net/cnxk/cn9k_ethdev.c
index a24d4187d5c616428ab1d57d84d9d4967201bbcc..a388b3a8a62207849d225301f978835d427a79cc 100644 (file)
--- a/drivers/net/cnxk/cn9k_ethdev.c
+++ b/drivers/net/cnxk/cn9k_ethdev.c
@@ -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 */

diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
index 12ff30f364c903cfc5989717361ce1bb2071bb34..3912c2421b33d58c05b1bb34aee0282e93638df0 100644 (file)
--- a/drivers/net/cnxk/cnxk_ethdev.c
+++ b/drivers/net/cnxk/cnxk_ethdev.c
@@ -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 */