ethdev: separate driver APIs

[dpdk.git] / drivers / net / mlx5 / mlx5_vlan.c

diff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c
index d707984..d51dbe9 100644 (file)
--- a/drivers/net/mlx5/mlx5_vlan.c
+++ b/drivers/net/mlx5/mlx5_vlan.c
@@ -36,7 +36,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_common.h>
 
 #include "mlx5_utils.h"
@@ -44,7 +44,7 @@
 #include "mlx5_autoconf.h"
 
 /**
- * Configure a VLAN filter.
+ * DPDK callback to configure a VLAN filter.
  *
  * @param dev
  *   Pointer to Ethernet device structure.
@@ -54,14 +54,16 @@
  *   Toggle filter.
  *
  * @return
- *   0 on success, errno value on failure.
+ *   0 on success, negative errno value on failure.
  */
-static int
-vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
+int
+mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 {
        struct priv *priv = dev->data->dev_private;
        unsigned int i;
+       int ret = 0;
 
+       priv_lock(priv);
        DEBUG("%p: %s VLAN filter ID %" PRIu16,
              (void *)dev, (on ? "enable" : "disable"), vlan_id);
        assert(priv->vlan_filter_n <= RTE_DIM(priv->vlan_filter));
@@ -69,13 +71,15 @@ vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
                if (priv->vlan_filter[i] == vlan_id)
                        break;
        /* Check if there's room for another VLAN filter. */
-       if (i == RTE_DIM(priv->vlan_filter))
-               return ENOMEM;
+       if (i == RTE_DIM(priv->vlan_filter)) {
+               ret = -ENOMEM;
+               goto out;
+       }
        if (i < priv->vlan_filter_n) {
                assert(priv->vlan_filter_n != 0);
                /* Enabling an existing VLAN filter has no effect. */
                if (on)
-                       return 0;
+                       goto out;
                /* Remove VLAN filter from list. */
                --priv->vlan_filter_n;
                memmove(&priv->vlan_filter[i],
@@ -87,41 +91,16 @@ vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
                assert(i == priv->vlan_filter_n);
                /* Disabling an unknown VLAN filter has no effect. */
                if (!on)
-                       return 0;
+                       goto out;
                /* Add new VLAN filter. */
                priv->vlan_filter[priv->vlan_filter_n] = vlan_id;
                ++priv->vlan_filter_n;
        }
-       /* Rehash flows in all hash RX queues. */
-       priv_mac_addrs_disable(priv);
-       priv_special_flow_disable_all(priv);
-       return priv_rehash_flows(priv);
-}
-
-/**
- * DPDK callback to configure a VLAN filter.
- *
- * @param dev
- *   Pointer to Ethernet device structure.
- * @param vlan_id
- *   VLAN ID to filter.
- * @param on
- *   Toggle filter.
- *
- * @return
- *   0 on success, negative errno value on failure.
- */
-int
-mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
-{
-       struct priv *priv = dev->data->dev_private;
-       int ret;
-
-       priv_lock(priv);
-       ret = vlan_filter_set(dev, vlan_id, on);
+       if (dev->data->dev_started)
+               priv_dev_traffic_restart(priv, dev);
+out:
        priv_unlock(priv);
-       assert(ret >= 0);
-       return -ret;
+       return ret;
 }
 
 /**
@@ -148,6 +127,11 @@ priv_vlan_strip_queue_set(struct priv *priv, uint16_t idx, int on)
 
        DEBUG("set VLAN offloads 0x%x for port %d queue %d",
              vlan_offloads, rxq->port_id, idx);
+       if (!rxq_ctrl->ibv) {
+               /* Update related bits in RX queue. */
+               rxq->vlan_strip = !!on;
+               return;
+       }
        mod = (struct ibv_wq_attr){
                .attr_mask = IBV_WQ_ATTR_FLAGS,
                .flags_mask = IBV_WQ_FLAGS_CVLAN_STRIPPING,
@@ -181,7 +165,7 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
        struct priv *priv = dev->data->dev_private;
 
        /* Validate hw support */
-       if (!priv->hw_vlan_strip) {
+       if (!priv->config.hw_vlan_strip) {
                ERROR("VLAN stripping is not supported");
                return;
        }
@@ -205,18 +189,19 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
  * @param mask
  *   VLAN offload bit mask.
  */
-void
+int
 mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 {
        struct priv *priv = dev->data->dev_private;
        unsigned int i;
 
        if (mask & ETH_VLAN_STRIP_MASK) {
-               int hw_vlan_strip = !!dev->data->dev_conf.rxmode.hw_vlan_strip;
+               int hw_vlan_strip = !!(dev->data->dev_conf.rxmode.offloads &
+                                      DEV_RX_OFFLOAD_VLAN_STRIP);
 
-               if (!priv->hw_vlan_strip) {
+               if (!priv->config.hw_vlan_strip) {
                        ERROR("VLAN stripping is not supported");
-                       return;
+                       return 0;
                }
 
                /* Run on every RX queue and set/reset VLAN stripping. */
@@ -225,4 +210,6 @@ mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask)
                        priv_vlan_strip_queue_set(priv, i, hw_vlan_strip);
                priv_unlock(priv);
        }
+
+       return 0;
 }