doc: use SPDX tag for bnx2x guide

[dpdk.git] / drivers / net / null / rte_eth_null.c

diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 7d89a32..b2c92ab 100644 (file)
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -62,7 +62,6 @@ struct null_queue {
 
        rte_atomic64_t rx_pkts;
        rte_atomic64_t tx_pkts;
-       rte_atomic64_t err_pkts;
 };
 
 struct pmd_internals {
@@ -73,7 +72,7 @@ struct pmd_internals {
        struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];
        struct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT];
 
-       struct ether_addr eth_addr;
+       struct rte_ether_addr eth_addr;
        /** Bit mask of RSS offloads, the bit offset also means flow type */
        uint64_t flow_type_rss_offloads;
 
@@ -89,9 +88,15 @@ static struct rte_eth_link pmd_link = {
        .link_speed = ETH_SPEED_NUM_10G,
        .link_duplex = ETH_LINK_FULL_DUPLEX,
        .link_status = ETH_LINK_DOWN,
-       .link_autoneg = ETH_LINK_AUTONEG,
+       .link_autoneg = ETH_LINK_FIXED,
 };
 
+static int eth_null_logtype;
+
+#define PMD_LOG(level, fmt, args...) \
+       rte_log(RTE_LOG_ ## level, eth_null_logtype, \
+               "%s(): " fmt "\n", __func__, ##args)
+
 static uint16_t
 eth_null_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 {
@@ -305,7 +310,7 @@ static int
 eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
 {
        unsigned i, num_stats;
-       unsigned long rx_total = 0, tx_total = 0, tx_err_total = 0;
+       unsigned long rx_total = 0, tx_total = 0;
        const struct pmd_internals *internal;
 
        if ((dev == NULL) || (igb_stats == NULL))
@@ -327,15 +332,11 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
        for (i = 0; i < num_stats; i++) {
                igb_stats->q_opackets[i] =
                        internal->tx_null_queues[i].tx_pkts.cnt;
-               igb_stats->q_errors[i] =
-                       internal->tx_null_queues[i].err_pkts.cnt;
                tx_total += igb_stats->q_opackets[i];
-               tx_err_total += igb_stats->q_errors[i];
        }
 
        igb_stats->ipackets = rx_total;
        igb_stats->opackets = tx_total;
-       igb_stats->oerrors = tx_err_total;
 
        return 0;
 }
@@ -352,10 +353,8 @@ eth_stats_reset(struct rte_eth_dev *dev)
        internal = dev->data->dev_private;
        for (i = 0; i < RTE_DIM(internal->rx_null_queues); i++)
                internal->rx_null_queues[i].rx_pkts.cnt = 0;
-       for (i = 0; i < RTE_DIM(internal->tx_null_queues); i++) {
+       for (i = 0; i < RTE_DIM(internal->tx_null_queues); i++)
                internal->tx_null_queues[i].tx_pkts.cnt = 0;
-               internal->tx_null_queues[i].err_pkts.cnt = 0;
-       }
 }
 
 static void
@@ -461,7 +460,7 @@ eth_rss_hash_conf_get(struct rte_eth_dev *dev,
 
 static int
 eth_mac_address_set(__rte_unused struct rte_eth_dev *dev,
-                   __rte_unused struct ether_addr *addr)
+                   __rte_unused struct rte_ether_addr *addr)
 {
        return 0;
 }
@@ -486,8 +485,6 @@ static const struct eth_dev_ops ops = {
        .rss_hash_conf_get = eth_rss_hash_conf_get
 };
 
-static struct rte_vdev_driver pmd_null_drv;
-
 static int
 eth_dev_null_create(struct rte_vdev_device *dev,
                unsigned packet_size,
@@ -509,7 +506,7 @@ eth_dev_null_create(struct rte_vdev_device *dev,
        if (dev->device.numa_node == SOCKET_ID_ANY)
                dev->device.numa_node = rte_socket_id();
 
-       RTE_LOG(INFO, PMD, "Creating null ethdev on numa socket %u\n",
+       PMD_LOG(INFO, "Creating null ethdev on numa socket %u",
                dev->device.numa_node);
 
        eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internals));
@@ -529,7 +526,7 @@ eth_dev_null_create(struct rte_vdev_device *dev,
        internals->packet_size = packet_size;
        internals->packet_copy = packet_copy;
        internals->port_id = eth_dev->data->port_id;
-       eth_random_addr(internals->eth_addr.addr_bytes);
+       rte_eth_random_addr(internals->eth_addr.addr_bytes);
 
        internals->flow_type_rss_offloads =  ETH_RSS_PROTO_MASK;
        internals->reta_size = RTE_DIM(internals->reta_conf) * RTE_RETA_GROUP_SIZE;
@@ -553,6 +550,7 @@ eth_dev_null_create(struct rte_vdev_device *dev,
                eth_dev->tx_pkt_burst = eth_null_tx;
        }
 
+       rte_eth_dev_probing_finish(eth_dev);
        return 0;
 }
 
@@ -597,6 +595,7 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
        unsigned packet_size = default_packet_size;
        unsigned packet_copy = default_packet_copy;
        struct rte_kvargs *kvlist = NULL;
+       struct rte_eth_dev *eth_dev;
        int ret;
 
        if (!dev)
@@ -604,7 +603,20 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
 
        name = rte_vdev_device_name(dev);
        params = rte_vdev_device_args(dev);
-       RTE_LOG(INFO, PMD, "Initializing pmd_null for %s\n", name);
+       PMD_LOG(INFO, "Initializing pmd_null for %s", name);
+
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+               eth_dev = rte_eth_dev_attach_secondary(name);
+               if (!eth_dev) {
+                       PMD_LOG(ERR, "Failed to probe %s", name);
+                       return -1;
+               }
+               /* TODO: request info from primary to set up Rx and Tx */
+               eth_dev->dev_ops = &ops;
+               eth_dev->device = &dev->device;
+               rte_eth_dev_probing_finish(eth_dev);
+               return 0;
+       }
 
        if (params != NULL) {
                kvlist = rte_kvargs_parse(params, valid_arguments);
@@ -630,8 +642,8 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
                }
        }
 
-       RTE_LOG(INFO, PMD, "Configure pmd_null: packet size is %d, "
-                       "packet copy is %s\n", packet_size,
+       PMD_LOG(INFO, "Configure pmd_null: packet size is %d, "
+                       "packet copy is %s", packet_size,
                        packet_copy ? "enabled" : "disabled");
 
        ret = eth_dev_null_create(dev, packet_size, packet_copy);
@@ -650,7 +662,7 @@ rte_pmd_null_remove(struct rte_vdev_device *dev)
        if (!dev)
                return -EINVAL;
 
-       RTE_LOG(INFO, PMD, "Closing null ethdev on numa socket %u\n",
+       PMD_LOG(INFO, "Closing null ethdev on numa socket %u",
                        rte_socket_id());
 
        /* find the ethdev entry */
@@ -658,7 +670,9 @@ rte_pmd_null_remove(struct rte_vdev_device *dev)
        if (eth_dev == NULL)
                return -1;
 
-       rte_free(eth_dev->data->dev_private);
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+               /* mac_addrs must not be freed alone because part of dev_private */
+               eth_dev->data->mac_addrs = NULL;
 
        rte_eth_dev_release_port(eth_dev);
 
@@ -675,3 +689,10 @@ RTE_PMD_REGISTER_ALIAS(net_null, eth_null);
 RTE_PMD_REGISTER_PARAM_STRING(net_null,
        "size=<int> "
        "copy=<int>");
+
+RTE_INIT(eth_null_init_log)
+{
+       eth_null_logtype = rte_log_register("pmd.net.null");
+       if (eth_null_logtype >= 0)
+               rte_log_set_level(eth_null_logtype, RTE_LOG_NOTICE);
+}