New upstream version 17.11.1

[deb_dpdk.git] / drivers / net / mlx5 / mlx5_trigger.c

diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 5de2d02..d682ea2 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -64,8 +64,11 @@ priv_txq_start(struct priv *priv)
 
                if (!txq_ctrl)
                        continue;
-               LIST_FOREACH(mr, &priv->mr, next)
+               LIST_FOREACH(mr, &priv->mr, next) {
                        priv_txq_mp2mr_reg(priv, &txq_ctrl->txq, mr->mp, idx++);
+                       if (idx == MLX5_PMD_TX_MP_CACHE)
+                               break;
+               }
                txq_alloc_elts(txq_ctrl);
                txq_ctrl->ibv = mlx5_priv_txq_ibv_new(priv, i);
                if (!txq_ctrl->ibv) {
@@ -132,9 +135,6 @@ mlx5_dev_start(struct rte_eth_dev *dev)
        struct mlx5_mr *mr = NULL;
        int err;
 
-       if (mlx5_is_secondary())
-               return -E_RTE_SECONDARY;
-
        dev->data->dev_started = 1;
        priv_lock(priv);
        err = priv_flow_create_drop_queue(priv);
@@ -151,38 +151,29 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                      (void *)dev, strerror(err));
                goto error;
        }
-       /* Update send callback. */
-       priv_dev_select_tx_function(priv, dev);
        err = priv_rxq_start(priv);
        if (err) {
                ERROR("%p: RXQ allocation failed: %s",
                      (void *)dev, strerror(err));
                goto error;
        }
-       /* Update receive callback. */
-       priv_dev_select_rx_function(priv, dev);
-       err = priv_dev_traffic_enable(priv, dev);
-       if (err) {
-               ERROR("%p: an error occurred while configuring control flows:"
-                     " %s",
-                     (void *)priv, strerror(err));
-               goto error;
-       }
-       err = priv_flow_start(priv, &priv->flows);
-       if (err) {
-               ERROR("%p: an error occurred while configuring flows:"
-                     " %s",
-                     (void *)priv, strerror(err));
-               goto error;
-       }
        err = priv_rx_intr_vec_enable(priv);
        if (err) {
                ERROR("%p: RX interrupt vector creation failed",
                      (void *)priv);
                goto error;
        }
-       priv_dev_interrupt_handler_install(priv, dev);
        priv_xstats_init(priv);
+       /* Update link status and Tx/Rx callbacks for the first time. */
+       memset(&dev->data->dev_link, 0, sizeof(struct rte_eth_link));
+       INFO("Forcing port %u link to be up", dev->data->port_id);
+       err = priv_force_link_status_change(priv, ETH_LINK_UP);
+       if (err) {
+               DEBUG("Failed to set port %u link to be up",
+                     dev->data->port_id);
+               goto error;
+       }
+       priv_dev_interrupt_handler_install(priv, dev);
        priv_unlock(priv);
        return 0;
 error:
@@ -196,7 +187,7 @@ error:
        priv_rxq_stop(priv);
        priv_flow_delete_drop_queue(priv);
        priv_unlock(priv);
-       return -err;
+       return err;
 }
 
 /**
@@ -213,9 +204,6 @@ mlx5_dev_stop(struct rte_eth_dev *dev)
        struct priv *priv = dev->data->dev_private;
        struct mlx5_mr *mr;
 
-       if (mlx5_is_secondary())
-               return;
-
        priv_lock(priv);
        dev->data->dev_started = 0;
        /* Prevent crashes when queues are still in use. */