New upstream version 17.08

[deb_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 017817e..6db362b 100644 (file)
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -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
@@ -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;
 }
@@ -278,7 +285,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
        ret = check_for_ext(ark);
        if (ret)
                return ret;
-       pci_dev = ARK_DEV_TO_PCI(dev);
+       pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        rte_eth_copy_pci_info(dev, pci_dev);
 
        /* Use dummy function until setup */
@@ -346,8 +353,9 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
        }
 
        if (ark->user_ext.dev_init) {
-               ark->user_data = ark->user_ext.dev_init(dev, ark->a_bar, 0);
-               if (!ark->user_data) {
+               ark->user_data[dev->data->port_id] =
+                       ark->user_ext.dev_init(dev, ark->a_bar, 0);
+               if (!ark->user_data[dev->data->port_id]) {
                        PMD_DRV_LOG(INFO,
                                    "Failed to initialize PMD extension!"
                                    " continuing without it\n");
@@ -369,7 +377,8 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
         */
        if (ark->user_ext.dev_get_port_count)
                port_count =
-                       ark->user_ext.dev_get_port_count(dev, ark->user_data);
+                       ark->user_ext.dev_get_port_count(dev,
+                                ark->user_data[dev->data->port_id]);
        ark->num_ports = port_count;
 
        for (p = 0; p < port_count; p++) {
@@ -410,9 +419,10 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
                        goto error;
                }
 
-               if (ark->user_ext.dev_init)
-                       ark->user_data =
+               if (ark->user_ext.dev_init) {
+                       ark->user_data[eth_dev->data->port_id] =
                                ark->user_ext.dev_init(dev, ark->a_bar, p);
+               }
        }
 
        return ret;
@@ -508,7 +518,8 @@ eth_ark_dev_uninit(struct rte_eth_dev *dev)
                return 0;
 
        if (ark->user_ext.dev_uninit)
-               ark->user_ext.dev_uninit(dev, ark->user_data);
+               ark->user_ext.dev_uninit(dev,
+                        ark->user_data[dev->data->port_id]);
 
        ark_pktgen_uninit(ark->pg);
        ark_pktchkr_uninit(ark->pc);
@@ -529,7 +540,8 @@ eth_ark_dev_configure(struct rte_eth_dev *dev)
 
        eth_ark_dev_set_link_up(dev);
        if (ark->user_ext.dev_configure)
-               return ark->user_ext.dev_configure(dev, ark->user_data);
+               return ark->user_ext.dev_configure(dev,
+                          ark->user_data[dev->data->port_id]);
        return 0;
 }
 
@@ -592,7 +604,8 @@ eth_ark_dev_start(struct rte_eth_dev *dev)
        }
 
        if (ark->user_ext.dev_start)
-               ark->user_ext.dev_start(dev, ark->user_data);
+               ark->user_ext.dev_start(dev,
+                       ark->user_data[dev->data->port_id]);
 
        return 0;
 }
@@ -614,7 +627,8 @@ eth_ark_dev_stop(struct rte_eth_dev *dev)
 
        /* Stop the extension first */
        if (ark->user_ext.dev_stop)
-               ark->user_ext.dev_stop(dev, ark->user_data);
+               ark->user_ext.dev_stop(dev,
+                      ark->user_data[dev->data->port_id]);
 
        /* Stop the packet generator */
        if (ark->start_pg)
@@ -636,7 +650,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev)
        }
 
        /* Stop DDM */
-       /* Wait up to 0.1 second.  each stop is upto 1000 * 10 useconds */
+       /* Wait up to 0.1 second.  each stop is up to 1000 * 10 useconds */
        for (i = 0; i < 10; i++) {
                status = ark_ddm_stop(ark->ddm.v, 1);
                if (status == 0)
@@ -697,7 +711,8 @@ eth_ark_dev_close(struct rte_eth_dev *dev)
        uint16_t i;
 
        if (ark->user_ext.dev_close)
-               ark->user_ext.dev_close(dev, ark->user_data);
+               ark->user_ext.dev_close(dev,
+                ark->user_data[dev->data->port_id]);
 
        eth_ark_dev_stop(dev);
        eth_ark_udm_force_close(dev);
@@ -751,7 +766,7 @@ 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 = ARK_DEV_TO_PCI(dev);
+       dev_info->pci_dev = RTE_ETH_DEV_TO_PCI(dev);
 }
 
 static int
@@ -765,7 +780,7 @@ eth_ark_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
        if (ark->user_ext.link_update) {
                return ark->user_ext.link_update
                        (dev, wait_to_complete,
-                        ark->user_data);
+                        ark->user_data[dev->data->port_id]);
        }
        return 0;
 }
@@ -778,7 +793,8 @@ eth_ark_dev_set_link_up(struct rte_eth_dev *dev)
                (struct ark_adapter *)dev->data->dev_private;
 
        if (ark->user_ext.dev_set_link_up)
-               return ark->user_ext.dev_set_link_up(dev, ark->user_data);
+               return ark->user_ext.dev_set_link_up(dev,
+                            ark->user_data[dev->data->port_id]);
        return 0;
 }
 
@@ -790,7 +806,8 @@ eth_ark_dev_set_link_down(struct rte_eth_dev *dev)
                (struct ark_adapter *)dev->data->dev_private;
 
        if (ark->user_ext.dev_set_link_down)
-               return ark->user_ext.dev_set_link_down(dev, ark->user_data);
+               return ark->user_ext.dev_set_link_down(dev,
+                      ark->user_data[dev->data->port_id]);
        return 0;
 }
 
@@ -813,7 +830,8 @@ 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, ark->user_data);
+               ark->user_ext.stats_get(dev, stats,
+                       ark->user_data[dev->data->port_id]);
 }
 
 static void
@@ -824,11 +842,12 @@ 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)
-               ark->user_ext.stats_reset(dev, ark->user_data);
+               ark->user_ext.stats_reset(dev,
+                         ark->user_data[dev->data->port_id]);
 }
 
 static int
@@ -845,7 +864,7 @@ eth_ark_macaddr_add(struct rte_eth_dev *dev,
                                           mac_addr,
                                           index,
                                           pool,
-                                          ark->user_data);
+                          ark->user_data[dev->data->port_id]);
                return 0;
        }
        return -ENOTSUP;
@@ -858,7 +877,8 @@ eth_ark_macaddr_remove(struct rte_eth_dev *dev, uint32_t index)
                (struct ark_adapter *)dev->data->dev_private;
 
        if (ark->user_ext.mac_addr_remove)
-               ark->user_ext.mac_addr_remove(dev, index, ark->user_data);
+               ark->user_ext.mac_addr_remove(dev, index,
+                             ark->user_data[dev->data->port_id]);
 }
 
 static void
@@ -869,7 +889,21 @@ eth_ark_set_default_mac_addr(struct rte_eth_dev *dev,
                (struct ark_adapter *)dev->data->dev_private;
 
        if (ark->user_ext.mac_addr_set)
-               ark->user_ext.mac_addr_set(dev, mac_addr, ark->user_data);
+               ark->user_ext.mac_addr_set(dev, mac_addr,
+                          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