ethdev: replace bus specific struct with generic dev

[dpdk.git] / drivers / net / ark / ark_ethdev.c

diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index 0931712..c9d5419 100644 (file)
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -35,12 +35,12 @@
 #include <sys/stat.h>
 #include <dlfcn.h>
 
+#include <rte_bus_pci.h>
 #include <rte_ethdev_pci.h>
 #include <rte_kvargs.h>
 
 #include "ark_global.h"
 #include "ark_logs.h"
-#include "ark_ethdev.h"
 #include "ark_ethdev_tx.h"
 #include "ark_ethdev_rx.h"
 #include "ark_mpu.h"
@@ -66,7 +66,7 @@ static int eth_ark_dev_link_update(struct rte_eth_dev *dev,
                                   int wait_to_complete);
 static int eth_ark_dev_set_link_up(struct rte_eth_dev *dev);
 static int eth_ark_dev_set_link_down(struct rte_eth_dev *dev);
-static void eth_ark_dev_stats_get(struct rte_eth_dev *dev,
+static int eth_ark_dev_stats_get(struct rte_eth_dev *dev,
                                  struct rte_eth_stats *stats);
 static void eth_ark_dev_stats_reset(struct rte_eth_dev *dev);
 static void eth_ark_set_default_mac_addr(struct rte_eth_dev *dev,
@@ -77,6 +77,7 @@ static int eth_ark_macaddr_add(struct rte_eth_dev *dev,
                               uint32_t pool);
 static void eth_ark_macaddr_remove(struct rte_eth_dev *dev,
                                   uint32_t index);
+static int  eth_ark_set_mtu(struct rte_eth_dev *dev, uint16_t size);
 
 /*
  * The packet generator is a functional block used to generate packet
@@ -179,6 +180,8 @@ static const struct eth_dev_ops ark_eth_dev_ops = {
        .mac_addr_add = eth_ark_macaddr_add,
        .mac_addr_remove = eth_ark_macaddr_remove,
        .mac_addr_set = eth_ark_set_default_mac_addr,
+
+       .mtu_set = eth_ark_set_mtu,
 };
 
 static int
@@ -239,7 +242,7 @@ check_for_ext(struct ark_adapter *ark)
                (int (*)(struct rte_eth_dev *, void *))
                dlsym(ark->d_handle, "dev_set_link_down");
        ark->user_ext.stats_get =
-               (void (*)(struct rte_eth_dev *, struct rte_eth_stats *,
+               (int (*)(struct rte_eth_dev *, struct rte_eth_stats *,
                          void *))
                dlsym(ark->d_handle, "stats_get");
        ark->user_ext.stats_reset =
@@ -256,6 +259,10 @@ check_for_ext(struct ark_adapter *ark)
                (void (*)(struct rte_eth_dev *, struct ether_addr *,
                          void *))
                dlsym(ark->d_handle, "mac_addr_set");
+       ark->user_ext.set_mtu =
+               (int (*)(struct rte_eth_dev *, uint16_t,
+                         void *))
+               dlsym(ark->d_handle, "set_mtu");
 
        return found;
 }
@@ -336,7 +343,6 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
        /* We are a single function multi-port device. */
        ret = ark_config_device(dev);
        dev->dev_ops = &ark_eth_dev_ops;
-       dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
 
        dev->data->mac_addrs = rte_zmalloc("ark", ETHER_ADDR_LEN, 0);
        if (!dev->data->mac_addrs) {
@@ -445,10 +451,16 @@ ark_config_device(struct rte_eth_dev *dev)
         */
        ark->start_pg = 0;
        ark->pg = ark_pktgen_init(ark->pktgen.v, 0, 1);
+       if (ark->pg == NULL)
+               return -1;
        ark_pktgen_reset(ark->pg);
        ark->pc = ark_pktchkr_init(ark->pktchkr.v, 0, 1);
+       if (ark->pc == NULL)
+               return -1;
        ark_pktchkr_stop(ark->pc);
        ark->pd = ark_pktdir_init(ark->pktdir.v);
+       if (ark->pd == NULL)
+               return -1;
 
        /* Verify HW */
        if (ark_udm_verify(ark->udm.v))
@@ -634,7 +646,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev)
        for (i = 0; i < dev->data->nb_tx_queues; i++) {
                status = eth_ark_tx_queue_stop(dev, i);
                if (status != 0) {
-                       uint8_t port = dev->data->port_id;
+                       uint16_t port = dev->data->port_id;
                        PMD_DRV_LOG(ERR,
                                    "tx_queue stop anomaly"
                                    " port %u, queue %u\n",
@@ -686,7 +698,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev)
        ark_udm_dump_stats(ark->udm.v, "Post stop");
        ark_udm_dump_perf(ark->udm.v, "Post stop");
 
-       for (i = 0; i < dev->data->nb_tx_queues; i++)
+       for (i = 0; i < dev->data->nb_rx_queues; i++)
                eth_ark_rx_dump_queue(dev, i, __func__);
 
        /* Stop the packet checker if it is running */
@@ -759,7 +771,6 @@ eth_ark_dev_info_get(struct rte_eth_dev *dev,
                                ETH_LINK_SPEED_40G |
                                ETH_LINK_SPEED_50G |
                                ETH_LINK_SPEED_100G);
-       dev_info->pci_dev = RTE_ETH_DEV_TO_PCI(dev);
 }
 
 static int
@@ -804,7 +815,7 @@ eth_ark_dev_set_link_down(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 eth_ark_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
        uint16_t i;
@@ -823,8 +834,9 @@ eth_ark_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
        for (i = 0; i < dev->data->nb_rx_queues; i++)
                eth_rx_queue_stats_get(dev->data->rx_queues[i], stats);
        if (ark->user_ext.stats_get)
-               ark->user_ext.stats_get(dev, stats,
+               return ark->user_ext.stats_get(dev, stats,
                        ark->user_data[dev->data->port_id]);
+       return 0;
 }
 
 static void
@@ -835,7 +847,7 @@ eth_ark_dev_stats_reset(struct rte_eth_dev *dev)
                (struct ark_adapter *)dev->data->dev_private;
 
        for (i = 0; i < dev->data->nb_tx_queues; i++)
-               eth_tx_queue_stats_reset(dev->data->rx_queues[i]);
+               eth_tx_queue_stats_reset(dev->data->tx_queues[i]);
        for (i = 0; i < dev->data->nb_rx_queues; i++)
                eth_rx_queue_stats_reset(dev->data->rx_queues[i]);
        if (ark->user_ext.stats_reset)
@@ -886,6 +898,19 @@ eth_ark_set_default_mac_addr(struct rte_eth_dev *dev,
                           ark->user_data[dev->data->port_id]);
 }
 
+static int
+eth_ark_set_mtu(struct rte_eth_dev *dev, uint16_t  size)
+{
+       struct ark_adapter *ark =
+               (struct ark_adapter *)dev->data->dev_private;
+
+       if (ark->user_ext.set_mtu)
+               return ark->user_ext.set_mtu(dev, size,
+                            ark->user_data[dev->data->port_id]);
+
+       return -ENOTSUP;
+}
+
 static inline int
 process_pktdir_arg(const char *key, const char *value,
                   void *extra_args)