net/ice/base: init boost TCAM table for parser

[dpdk.git] / drivers / net / mlx5 / linux / mlx5_mp_os.c

diff --git a/drivers/net/mlx5/linux/mlx5_mp_os.c b/drivers/net/mlx5/linux/mlx5_mp_os.c
index dd9a2c2..3a4aa76 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_mp_os.c
+++ b/drivers/net/mlx5/linux/mlx5_mp_os.c
@@ -7,7 +7,7 @@
 #include <time.h>
 
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_string_fns.h>
 
 #include <mlx5_common_mp.h>
@@ -16,6 +16,8 @@
 
 #include "mlx5.h"
 #include "mlx5_rxtx.h"
+#include "mlx5_rx.h"
+#include "mlx5_tx.h"
 #include "mlx5_utils.h"
 
 int
@@ -63,6 +65,30 @@ mlx5_mp_os_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer)
                                        (dev, &param->args.state_modify);
                ret = rte_mp_reply(&mp_res, peer);
                break;
+       case MLX5_MP_REQ_QUEUE_RX_STOP:
+               mp_init_msg(&priv->mp_id, &mp_res, param->type);
+               res->result = mlx5_rx_queue_stop_primary
+                                       (dev, param->args.queue_id.queue_id);
+               ret = rte_mp_reply(&mp_res, peer);
+               break;
+       case MLX5_MP_REQ_QUEUE_RX_START:
+               mp_init_msg(&priv->mp_id, &mp_res, param->type);
+               res->result = mlx5_rx_queue_start_primary
+                                       (dev, param->args.queue_id.queue_id);
+               ret = rte_mp_reply(&mp_res, peer);
+               break;
+       case MLX5_MP_REQ_QUEUE_TX_STOP:
+               mp_init_msg(&priv->mp_id, &mp_res, param->type);
+               res->result = mlx5_tx_queue_stop_primary
+                                       (dev, param->args.queue_id.queue_id);
+               ret = rte_mp_reply(&mp_res, peer);
+               break;
+       case MLX5_MP_REQ_QUEUE_TX_START:
+               mp_init_msg(&priv->mp_id, &mp_res, param->type);
+               res->result = mlx5_tx_queue_start_primary
+                                       (dev, param->args.queue_id.queue_id);
+               ret = rte_mp_reply(&mp_res, peer);
+               break;
        default:
                rte_errno = EINVAL;
                DRV_LOG(ERR, "port %u invalid mp request type",
@@ -86,11 +112,12 @@ mlx5_mp_os_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer)
 int
 mlx5_mp_os_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer)
 {
-       struct rte_mp_msg mp_res;
+struct rte_mp_msg mp_res;
        struct mlx5_mp_param *res = (struct mlx5_mp_param *)mp_res.param;
        const struct mlx5_mp_param *param =
                (const struct mlx5_mp_param *)mp_msg->param;
        struct rte_eth_dev *dev;
+       struct mlx5_proc_priv *ppriv;
        struct mlx5_priv *priv;
        int ret;
 
@@ -105,9 +132,23 @@ mlx5_mp_os_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer)
        switch (param->type) {
        case MLX5_MP_REQ_START_RXTX:
                DRV_LOG(INFO, "port %u starting datapath", dev->data->port_id);
-               rte_mb();
                dev->rx_pkt_burst = mlx5_select_rx_function(dev);
                dev->tx_pkt_burst = mlx5_select_tx_function(dev);
+               ppriv = (struct mlx5_proc_priv *)dev->process_private;
+               /* If Tx queue number changes, re-initialize UAR. */
+               if (ppriv->uar_table_sz != priv->txqs_n) {
+                       mlx5_tx_uar_uninit_secondary(dev);
+                       mlx5_proc_priv_uninit(dev);
+                       ret = mlx5_proc_priv_init(dev);
+                       if (ret)
+                               return -rte_errno;
+                       ret = mlx5_tx_uar_init_secondary(dev, mp_msg->fds[0]);
+                       if (ret) {
+                               mlx5_proc_priv_uninit(dev);
+                               return -rte_errno;
+                       }
+               }
+               rte_mb();
                mp_init_msg(&priv->mp_id, &mp_res, param->type);
                res->result = 0;
                ret = rte_mp_reply(&mp_res, peer);
@@ -159,6 +200,10 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum mlx5_mp_req_type type)
                return;
        }
        mp_init_msg(&priv->mp_id, &mp_req, type);
+       if (type == MLX5_MP_REQ_START_RXTX) {
+               mp_req.num_fds = 1;
+               mp_req.fds[0] = ((struct ibv_context *)priv->sh->ctx)->cmd_fd;
+       }
        ret = rte_mp_request_sync(&mp_req, &mp_rep, &ts);
        if (ret) {
                if (rte_errno != ENOTSUP)
@@ -210,3 +255,51 @@ mlx5_mp_os_req_stop_rxtx(struct rte_eth_dev *dev)
 {
        mp_req_on_rxtx(dev, MLX5_MP_REQ_STOP_RXTX);
 }
+
+/**
+ * Request Verbs Rx/Tx queue stop or start to the primary process.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet structure.
+ * @param queue_id
+ *   Queue ID to control.
+ * @param req_type
+ *   request type
+ *     MLX5_MP_REQ_QUEUE_RX_START - start Rx queue
+ *     MLX5_MP_REQ_QUEUE_TX_START - stop Tx queue
+ *     MLX5_MP_REQ_QUEUE_RX_STOP - stop Rx queue
+ *     MLX5_MP_REQ_QUEUE_TX_STOP - stop Tx queue
+ * @return
+ *   0 on success, a negative errno value otherwise and
+ *     rte_errno is set.
+ */
+int
+mlx5_mp_os_req_queue_control(struct rte_eth_dev *dev, uint16_t queue_id,
+                         enum mlx5_mp_req_type req_type)
+{
+       struct rte_mp_msg mp_req;
+       struct rte_mp_msg *mp_res;
+       struct rte_mp_reply mp_rep;
+       struct mlx5_mp_param *req = (struct mlx5_mp_param *)mp_req.param;
+       struct mlx5_mp_param *res;
+       struct timespec ts = {.tv_sec = MLX5_MP_REQ_TIMEOUT_SEC, .tv_nsec = 0};
+       struct mlx5_priv *priv;
+       int ret;
+
+       MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_SECONDARY);
+       priv = dev->data->dev_private;
+       mp_init_msg(&priv->mp_id, &mp_req, req_type);
+       req->args.queue_id.queue_id = queue_id;
+       ret = rte_mp_request_sync(&mp_req, &mp_rep, &ts);
+       if (ret) {
+               DRV_LOG(ERR, "port %u request to primary process failed",
+                       dev->data->port_id);
+               return -rte_errno;
+       }
+       MLX5_ASSERT(mp_rep.nb_received == 1);
+       mp_res = &mp_rep.msgs[0];
+       res = (struct mlx5_mp_param *)mp_res->param;
+       ret = res->result;
+       free(mp_rep.msgs);
+       return ret;
+}