ethdev: add device flag to bypass auto-filled queue xstats

[dpdk.git] / drivers / net / mvneta / mvneta_ethdev.c

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index 3ba0ac7..2cd7391 100644 (file)
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -34,8 +34,6 @@
 /** Maximum length of a match string */
 #define MVNETA_MATCH_LEN 16
 
-int mvneta_logtype;
-
 static const char * const valid_args[] = {
        MVNETA_IFACE_NAME_ARG,
        NULL
@@ -48,7 +46,7 @@ struct mvneta_ifnames {
 
 static int mvneta_dev_num;
 
-static void mvneta_stats_reset(struct rte_eth_dev *dev);
+static int mvneta_stats_reset(struct rte_eth_dev *dev);
 static int rte_pmd_mvneta_remove(struct rte_vdev_device *vdev);
 
 
@@ -410,19 +408,23 @@ out:
  * @param dev
  *   Pointer to Ethernet device structure.
  */
-static void
+static int
 mvneta_dev_stop(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
 
+       dev->data->dev_started = 0;
+
        if (!priv->ppio)
-               return;
+               return 0;
 
        mvneta_dev_set_link_down(dev);
        mvneta_flush_queues(dev);
        neta_ppio_deinit(priv->ppio);
 
        priv->ppio = NULL;
+
+       return 0;
 }
 
 /**
@@ -431,14 +433,17 @@ mvneta_dev_stop(struct rte_eth_dev *dev)
  * @param dev
  *   Pointer to Ethernet device structure.
  */
-static void
+static int
 mvneta_dev_close(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
-       int i;
+       int i, ret = 0;
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
 
        if (priv->ppio)
-               mvneta_dev_stop(dev);
+               ret = mvneta_dev_stop(dev);
 
        for (i = 0; i < dev->data->nb_rx_queues; i++) {
                mvneta_rx_queue_release(dev->data->rx_queues[i]);
@@ -457,6 +462,8 @@ mvneta_dev_close(struct rte_eth_dev *dev)
                mvneta_neta_deinit();
                rte_mvep_deinit(MVEP_MOD_T_NETA);
        }
+
+       return ret;
 }
 
 /**
@@ -534,25 +541,30 @@ mvneta_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   always 0
  */
-static void
+static int
 mvneta_promiscuous_enable(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
        int ret, en;
 
        if (!priv->ppio)
-               return;
+               return 0;
 
        neta_ppio_get_promisc(priv->ppio, &en);
        if (en) {
                MVNETA_LOG(INFO, "Promiscuous already enabled");
-               return;
+               return 0;
        }
 
        ret = neta_ppio_set_promisc(priv->ppio, 1);
        if (ret)
                MVNETA_LOG(ERR, "Failed to enable promiscuous mode");
+
+       return 0;
 }
 
 /**
@@ -560,25 +572,30 @@ mvneta_promiscuous_enable(struct rte_eth_dev *dev)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   always 0
  */
-static void
+static int
 mvneta_promiscuous_disable(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
        int ret, en;
 
        if (!priv->ppio)
-               return;
+               return 0;
 
        neta_ppio_get_promisc(priv->ppio, &en);
        if (!en) {
                MVNETA_LOG(INFO, "Promiscuous already disabled");
-               return;
+               return 0;
        }
 
        ret = neta_ppio_set_promisc(priv->ppio, 0);
        if (ret)
                MVNETA_LOG(ERR, "Failed to disable promiscuous mode");
+
+       return 0;
 }
 
 /**
@@ -726,19 +743,24 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   0 on success, negative error value otherwise.
  */
-static void
+static int
 mvneta_stats_reset(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
        unsigned int ret;
 
        if (!priv->ppio)
-               return;
+               return 0;
 
        ret = mvneta_stats_get(dev, &priv->prev_stats);
        if (unlikely(ret))
-               RTE_LOG(ERR, PMD, "Failed to reset port statistics");
+               MVNETA_LOG(ERR, "Failed to reset port statistics");
+
+       return ret;
 }
 
 
@@ -814,14 +836,11 @@ mvneta_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
        memcpy(eth_dev->data->mac_addrs[0].addr_bytes,
               req.ifr_addr.sa_data, RTE_ETHER_ADDR_LEN);
 
-       eth_dev->data->kdrv = RTE_KDRV_NONE;
        eth_dev->device = &vdev->device;
        eth_dev->rx_pkt_burst = mvneta_rx_pkt_burst;
        mvneta_set_tx_function(eth_dev);
        eth_dev->dev_ops = &mvneta_ops;
-
-       /* Flag to call rte_eth_dev_release_port() in rte_eth_dev_close(). */
-       eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
 
        rte_eth_dev_probing_finish(eth_dev);
        return 0;
@@ -950,14 +969,15 @@ static int
 rte_pmd_mvneta_remove(struct rte_vdev_device *vdev)
 {
        uint16_t port_id;
+       int ret = 0;
 
        RTE_ETH_FOREACH_DEV(port_id) {
                if (rte_eth_devices[port_id].device != &vdev->device)
                        continue;
-               rte_eth_dev_close(port_id);
+               ret |= rte_eth_dev_close(port_id);
        }
 
-       return 0;
+       return ret == 0 ? 0 : -EIO;
 }
 
 static struct rte_vdev_driver pmd_mvneta_drv = {
@@ -967,10 +987,4 @@ static struct rte_vdev_driver pmd_mvneta_drv = {
 
 RTE_PMD_REGISTER_VDEV(net_mvneta, pmd_mvneta_drv);
 RTE_PMD_REGISTER_PARAM_STRING(net_mvneta, "iface=<ifc>");
-
-RTE_INIT(mvneta_init_log)
-{
-       mvneta_logtype = rte_log_register("pmd.net.mvneta");
-       if (mvneta_logtype >= 0)
-               rte_log_set_level(mvneta_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(mvneta_logtype, pmd.net.mvneta, NOTICE);