net/i40e: fix parsing packet type for NEON
[dpdk.git] / drivers / net / mlx5 / linux / mlx5_os.c
index a8cc5f3..5e3ae9f 100644 (file)
@@ -645,6 +645,53 @@ mlx5_flow_counter_mode_config(struct rte_eth_dev *dev __rte_unused)
 #endif
 }
 
+static void
+mlx5_queue_counter_id_prepare(struct rte_eth_dev *dev)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       void *ctx = priv->sh->ctx;
+
+       priv->q_counters = mlx5_devx_cmd_queue_counter_alloc(ctx);
+       if (!priv->q_counters) {
+               struct ibv_cq *cq = mlx5_glue->create_cq(ctx, 1, NULL, NULL, 0);
+               struct ibv_wq *wq;
+
+               DRV_LOG(DEBUG, "Port %d queue counter object cannot be created "
+                       "by DevX - fall-back to use the kernel driver global "
+                       "queue counter.", dev->data->port_id);
+               /* Create WQ by kernel and query its queue counter ID. */
+               if (cq) {
+                       wq = mlx5_glue->create_wq(ctx,
+                                                 &(struct ibv_wq_init_attr){
+                                                   .wq_type = IBV_WQT_RQ,
+                                                   .max_wr = 1,
+                                                   .max_sge = 1,
+                                                   .pd = priv->sh->pd,
+                                                   .cq = cq,
+                                               });
+                       if (wq) {
+                               /* Counter is assigned only on RDY state. */
+                               int ret = mlx5_glue->modify_wq(wq,
+                                                &(struct ibv_wq_attr){
+                                                .attr_mask = IBV_WQ_ATTR_STATE,
+                                                .wq_state = IBV_WQS_RDY,
+                                               });
+
+                               if (ret == 0)
+                                       mlx5_devx_cmd_wq_query(wq,
+                                                        &priv->counter_set_id);
+                               claim_zero(mlx5_glue->destroy_wq(wq));
+                       }
+                       claim_zero(mlx5_glue->destroy_cq(cq));
+               }
+       } else {
+               priv->counter_set_id = priv->q_counters->id;
+       }
+       if (priv->counter_set_id == 0)
+               DRV_LOG(INFO, "Part of the port %d statistics will not be "
+                       "available.", dev->data->port_id);
+}
+
 /**
  * Spawn an Ethernet device from Verbs information.
  *
@@ -676,7 +723,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
        int err = 0;
        unsigned int hw_padding = 0;
        unsigned int mps;
-       unsigned int cqe_comp;
        unsigned int tunnel_en = 0;
        unsigned int mpls_en = 0;
        unsigned int swp = 0;
@@ -705,6 +751,17 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                                strerror(rte_errno));
                        return NULL;
                }
+               if (eth_da.type == RTE_ETH_REPRESENTOR_NONE) {
+                       /* Representor not specified. */
+                       rte_errno = EBUSY;
+                       return NULL;
+               }
+               if (eth_da.type != RTE_ETH_REPRESENTOR_VF) {
+                       rte_errno = ENOTSUP;
+                       DRV_LOG(ERR, "unsupported representor type: %s",
+                               dpdk_dev->devargs->args);
+                       return NULL;
+               }
                for (i = 0; i < eth_da.nb_representor_ports; ++i)
                        if (eth_da.representor_ports[i] ==
                            (uint16_t)switch_info->port_name)
@@ -868,12 +925,8 @@ err_secondary:
                        mprq_caps.max_single_wqe_log_num_of_strides;
        }
 #endif
-       if (RTE_CACHE_LINE_SIZE == 128 &&
-           !(dv_attr.flags & MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP))
-               cqe_comp = 0;
-       else
-               cqe_comp = 1;
-       config->cqe_comp = cqe_comp;
+       /* Rx CQE compression is enabled by default. */
+       config->cqe_comp = 1;
 #ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
        if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
                tunnel_en = ((dv_attr.tunnel_offloads_caps &
@@ -1104,10 +1157,6 @@ err_secondary:
                config->mps == MLX5_MPW_ENHANCED ? "enhanced " :
                config->mps == MLX5_MPW ? "legacy " : "",
                config->mps != MLX5_MPW_DISABLED ? "enabled" : "disabled");
-       if (config->cqe_comp && !cqe_comp) {
-               DRV_LOG(WARNING, "Rx CQE compression isn't supported");
-               config->cqe_comp = 0;
-       }
        if (config->devx) {
                err = mlx5_devx_cmd_query_hca_attr(sh->ctx, &config->hca_attr);
                if (err) {
@@ -1124,6 +1173,9 @@ err_secondary:
                        sh->cmng.relaxed_ordering_read = 0;
                        sh->cmng.relaxed_ordering_write = 0;
                }
+               sh->rq_ts_format = config->hca_attr.rq_ts_format;
+               sh->sq_ts_format = config->hca_attr.sq_ts_format;
+               sh->qp_ts_format = config->hca_attr.qp_ts_format;
                /* Check for LRO support. */
                if (config->dest_tir && config->hca_attr.lro_cap &&
                    config->dv_flow_en) {
@@ -1145,7 +1197,7 @@ err_secondary:
                }
 #if defined(HAVE_MLX5DV_DR) && defined(HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER)
                if (config->hca_attr.qos.sup &&
-                   config->hca_attr.qos.srtcm_sup &&
+                   config->hca_attr.qos.flow_meter_old &&
                    config->dv_flow_en) {
                        uint8_t reg_c_mask =
                                config->hca_attr.qos.flow_meter_reg_c_ids;
@@ -1173,7 +1225,7 @@ err_secondary:
                                                              - 1 + REG_C_0;
                                priv->mtr_en = 1;
                                priv->mtr_reg_share =
-                                     config->hca_attr.qos.flow_meter_reg_share;
+                                     config->hca_attr.qos.flow_meter;
                                DRV_LOG(DEBUG, "The REG_C meter uses is %d",
                                        priv->mtr_color_reg);
                        }
@@ -1195,17 +1247,36 @@ err_secondary:
                if (config->hca_attr.log_max_ft_sampler_num > 0  &&
                    config->dv_flow_en) {
                        priv->sampler_en = 1;
-                       DRV_LOG(DEBUG, "The Sampler enabled!\n");
+                       DRV_LOG(DEBUG, "Sampler enabled!");
                } else {
                        priv->sampler_en = 0;
                        if (!config->hca_attr.log_max_ft_sampler_num)
-                               DRV_LOG(WARNING, "No available register for"
-                                               " Sampler.");
+                               DRV_LOG(WARNING,
+                                       "No available register for sampler.");
                        else
-                               DRV_LOG(DEBUG, "DV flow is not supported!\n");
+                               DRV_LOG(DEBUG, "DV flow is not supported!");
                }
 #endif
        }
+       if (config->cqe_comp && RTE_CACHE_LINE_SIZE == 128 &&
+           !(dv_attr.flags & MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP)) {
+               DRV_LOG(WARNING, "Rx CQE 128B compression is not supported");
+               config->cqe_comp = 0;
+       }
+       if (config->cqe_comp_fmt == MLX5_CQE_RESP_FORMAT_FTAG_STRIDX &&
+           (!config->devx || !config->hca_attr.mini_cqe_resp_flow_tag)) {
+               DRV_LOG(WARNING, "Flow Tag CQE compression"
+                                " format isn't supported.");
+               config->cqe_comp = 0;
+       }
+       if (config->cqe_comp_fmt == MLX5_CQE_RESP_FORMAT_L34H_STRIDX &&
+           (!config->devx || !config->hca_attr.mini_cqe_resp_l3_l4_tag)) {
+               DRV_LOG(WARNING, "L3/L4 Header CQE compression"
+                                " format isn't supported.");
+               config->cqe_comp = 0;
+       }
+       DRV_LOG(DEBUG, "Rx CQE compression is %ssupported",
+                       config->cqe_comp ? "" : "not ");
        if (config->tx_pp) {
                DRV_LOG(DEBUG, "Timestamp counter frequency %u kHz",
                        config->hca_attr.dev_freq_khz);
@@ -1488,6 +1559,7 @@ err_secondary:
                /* Use specific wrappers for Tx object. */
                priv->obj_ops.txq_obj_new = mlx5_os_txq_obj_new;
                priv->obj_ops.txq_obj_release = mlx5_os_txq_obj_release;
+               mlx5_queue_counter_id_prepare(eth_dev);
 
        } else {
                priv->obj_ops = ibv_obj_ops;
@@ -2423,6 +2495,10 @@ mlx5_os_read_dev_stat(struct mlx5_priv *priv, const char *ctr_name,
        int fd;
 
        if (priv->sh) {
+               if (priv->q_counters != NULL &&
+                   strcmp(ctr_name, "out_of_buffer") == 0)
+                       return mlx5_devx_cmd_queue_counter_query(priv->sh->ctx,
+                                                          0, (uint32_t *)stat);
                MKSTR(path, "%s/ports/%d/hw_counters/%s",
                      priv->sh->ibdev_path,
                      priv->dev_port,