ethdev: change device info get callback to return int

[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 9657444..3ba0ac7 100644 (file)
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -27,15 +27,6 @@
 
 #define MVNETA_IFACE_NAME_ARG "iface"
 
-#define MVNETA_RX_OFFLOADS (DEV_RX_OFFLOAD_JUMBO_FRAME | \
-                         DEV_RX_OFFLOAD_CHECKSUM)
-
-/** Port Tx offloads capabilities */
-#define MVNETA_TX_OFFLOADS (DEV_TX_OFFLOAD_IPV4_CKSUM | \
-                         DEV_TX_OFFLOAD_UDP_CKSUM | \
-                         DEV_TX_OFFLOAD_TCP_CKSUM | \
-                         DEV_TX_OFFLOAD_MULTI_SEGS)
-
 #define MVNETA_PKT_SIZE_MAX (16382 - MV_MH_SIZE) /* 9700B */
 #define MVNETA_DEFAULT_MTU 1500
 
@@ -57,6 +48,10 @@ struct mvneta_ifnames {
 
 static int mvneta_dev_num;
 
+static void mvneta_stats_reset(struct rte_eth_dev *dev);
+static int rte_pmd_mvneta_remove(struct rte_vdev_device *vdev);
+
+
 /**
  * Deinitialize packet processor.
  */
@@ -158,7 +153,7 @@ mvneta_dev_configure(struct rte_eth_dev *dev)
  * @param info
  *   Info structure output buffer.
  */
-static void
+static int
 mvneta_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
                   struct rte_eth_dev_info *info)
 {
@@ -192,6 +187,8 @@ mvneta_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
        info->default_txconf.offloads = 0;
 
        info->max_rx_pktlen = MVNETA_PKT_SIZE_MAX;
+
+       return 0;
 }
 
 /**
@@ -359,6 +356,8 @@ mvneta_dev_start(struct rte_eth_dev *dev)
        }
        priv->ppio_id = priv->ppio->port_id;
 
+       mvneta_stats_reset(dev);
+
        /*
         * In case there are some some stale uc/mc mac addresses flush them
         * here. It cannot be done during mvneta_dev_close() as port information
@@ -450,6 +449,14 @@ mvneta_dev_close(struct rte_eth_dev *dev)
                mvneta_tx_queue_release(dev->data->tx_queues[i]);
                dev->data->tx_queues[i] = NULL;
        }
+
+       mvneta_dev_num--;
+
+       if (mvneta_dev_num == 0) {
+               MVNETA_LOG(INFO, "Perform MUSDK deinit");
+               mvneta_neta_deinit();
+               rte_mvep_deinit(MVEP_MOD_T_NETA);
+       }
 }
 
 /**
@@ -707,10 +714,7 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
        stats->imissed += ppio_stats.rx_discard +
                          ppio_stats.rx_overrun -
                          priv->prev_stats.imissed;
-
-       stats->ierrors = ppio_stats.rx_packets_err +
-                       ppio_stats.rx_errors +
-                       ppio_stats.rx_crc_error -
+       stats->ierrors = ppio_stats.rx_packets_err -
                        priv->prev_stats.ierrors;
        stats->oerrors = ppio_stats.tx_errors - priv->prev_stats.oerrors;
 
@@ -816,6 +820,9 @@ mvneta_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
        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;
+
        rte_eth_dev_probing_finish(eth_dev);
        return 0;
 out_free:
@@ -914,20 +921,16 @@ init_devices:
                ret = mvneta_eth_dev_create(vdev, ifnames.names[i]);
                if (ret)
                        goto out_cleanup;
+
+               mvneta_dev_num++;
        }
-       mvneta_dev_num += ifnum;
 
        rte_kvargs_free(kvlist);
 
        return 0;
 out_cleanup:
-       for (; i > 0; i--)
-               mvneta_eth_dev_destroy_name(ifnames.names[i]);
+       rte_pmd_mvneta_remove(vdev);
 
-       if (mvneta_dev_num == 0) {
-               mvneta_neta_deinit();
-               rte_mvep_deinit(MVEP_MOD_T_NETA);
-       }
 out_free_kvlist:
        rte_kvargs_free(kvlist);
 
@@ -946,27 +949,12 @@ out_free_kvlist:
 static int
 rte_pmd_mvneta_remove(struct rte_vdev_device *vdev)
 {
-       int i;
-       const char *name;
-
-       name = rte_vdev_device_name(vdev);
-       if (!name)
-               return -EINVAL;
+       uint16_t port_id;
 
-       MVNETA_LOG(INFO, "Removing %s", name);
-
-       RTE_ETH_FOREACH_DEV(i) {
-               if (rte_eth_devices[i].device != &vdev->device)
+       RTE_ETH_FOREACH_DEV(port_id) {
+               if (rte_eth_devices[port_id].device != &vdev->device)
                        continue;
-
-               mvneta_eth_dev_destroy(&rte_eth_devices[i]);
-               mvneta_dev_num--;
-       }
-
-       if (mvneta_dev_num == 0) {
-               MVNETA_LOG(INFO, "Perform MUSDK deinit");
-               mvneta_neta_deinit();
-               rte_mvep_deinit(MVEP_MOD_T_NETA);
+               rte_eth_dev_close(port_id);
        }
 
        return 0;