net/ice/base: use package info from ice segment metadata

[dpdk.git] / drivers / net / octeontx / octeontx_ethdev.c

diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
index 10eeeac..3ee7b04 100644 (file)
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -487,6 +487,8 @@ octeontx_dev_close(struct rte_eth_dev *dev)
        int ret;
 
        PMD_INIT_FUNC_TRACE();
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
 
        rte_event_dev_close(nic->evdev);
 
@@ -509,15 +511,8 @@ octeontx_dev_close(struct rte_eth_dev *dev)
                rte_free(txq);
        }
 
-       /* Free MAC address table */
-       rte_free(dev->data->mac_addrs);
-       dev->data->mac_addrs = NULL;
-
        octeontx_port_close(nic);
 
-       dev->tx_pkt_burst = NULL;
-       dev->rx_pkt_burst = NULL;
-
        return 0;
 }
 
@@ -678,7 +673,7 @@ error:
        return ret;
 }
 
-static void
+static int
 octeontx_dev_stop(struct rte_eth_dev *dev)
 {
        struct octeontx_nic *nic = octeontx_pmd_priv(dev);
@@ -692,14 +687,14 @@ octeontx_dev_stop(struct rte_eth_dev *dev)
        if (ret < 0) {
                octeontx_log_err("failed to req stop port %d res=%d",
                                        nic->port_id, ret);
-               return;
+               return ret;
        }
 
        ret = octeontx_pki_port_stop(nic->port_id);
        if (ret < 0) {
                octeontx_log_err("failed to stop pki port %d res=%d",
                                        nic->port_id, ret);
-               return;
+               return ret;
        }
 
        ret = octeontx_pko_channel_stop(nic->base_ochan);
@@ -707,8 +702,10 @@ octeontx_dev_stop(struct rte_eth_dev *dev)
                octeontx_log_err("failed to stop channel %d VF%d %d %d",
                             nic->base_ochan, nic->port_id, nic->num_tx_queues,
                             ret);
-               return;
+               return ret;
        }
+
+       return 0;
 }
 
 static int
@@ -1378,6 +1375,7 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
        data->promiscuous = 0;
        data->all_multicast = 0;
        data->scattered_rx = 0;
+       data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
 
        /* Get maximum number of supported MAC entries */
        max_entries = octeontx_bgx_port_mac_entries_get(nic->port_id);
@@ -1465,10 +1463,9 @@ octeontx_remove(struct rte_vdev_device *dev)
        for (i = 0; i < OCTEONTX_VDEV_DEFAULT_MAX_NR_PORT; i++) {
                sprintf(octtx_name, "eth_octeontx_%d", i);
 
-               /* reserve an ethdev entry */
                eth_dev = rte_eth_dev_allocated(octtx_name);
                if (eth_dev == NULL)
-                       return -ENODEV;
+                       continue; /* port already released */
 
                if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
                        rte_eth_dev_release_port(eth_dev);
@@ -1478,9 +1475,8 @@ octeontx_remove(struct rte_vdev_device *dev)
                nic = octeontx_pmd_priv(eth_dev);
                rte_event_dev_stop(nic->evdev);
                PMD_INIT_LOG(INFO, "Closing octeontx device %s", octtx_name);
-
+               octeontx_dev_close(eth_dev);
                rte_eth_dev_release_port(eth_dev);
-               rte_event_dev_close(nic->evdev);
        }
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)