net/mlx5: add Rx HW timestamp

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

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index e7ec1da..632d451 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -558,7 +558,10 @@ mlx5_priv_rxq_ibv_new(struct priv *priv, uint16_t idx)
                container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);
        struct ibv_wq_attr mod;
        union {
-               struct ibv_cq_init_attr_ex cq;
+               struct {
+                       struct ibv_cq_init_attr_ex ibv;
+                       struct mlx5dv_cq_init_attr mlx5;
+               } cq;
                struct ibv_wq_init_attr wq;
                struct ibv_cq_ex cq_attr;
        } attr;
@@ -597,20 +600,29 @@ mlx5_priv_rxq_ibv_new(struct priv *priv, uint16_t idx)
                        goto error;
                }
        }
-       attr.cq = (struct ibv_cq_init_attr_ex){
+       attr.cq.ibv = (struct ibv_cq_init_attr_ex){
+               .cqe = cqe_n,
+               .channel = tmpl->channel,
                .comp_mask = 0,
        };
-       if (priv->cqe_comp) {
-               attr.cq.comp_mask |= IBV_CQ_INIT_ATTR_MASK_FLAGS;
-               attr.cq.flags |= MLX5DV_CQ_INIT_ATTR_MASK_COMPRESSED_CQE;
+       attr.cq.mlx5 = (struct mlx5dv_cq_init_attr){
+               .comp_mask = 0,
+       };
+       if (priv->cqe_comp && !rxq_data->hw_timestamp) {
+               attr.cq.mlx5.comp_mask |=
+                       MLX5DV_CQ_INIT_ATTR_MASK_COMPRESSED_CQE;
+               attr.cq.mlx5.cqe_comp_res_format = MLX5DV_CQE_RES_FORMAT_HASH;
                /*
                 * For vectorized Rx, it must not be doubled in order to
                 * make cq_ci and rq_ci aligned.
                 */
                if (rxq_check_vec_support(rxq_data) < 0)
                        cqe_n *= 2;
+       } else if (priv->cqe_comp && rxq_data->hw_timestamp) {
+               DEBUG("Rx CQE compression is disabled for HW timestamp");
        }
-       tmpl->cq = ibv_create_cq(priv->ctx, cqe_n, NULL, tmpl->channel, 0);
+       tmpl->cq = ibv_cq_ex_to_cq(mlx5dv_create_cq(priv->ctx, &attr.cq.ibv,
+                                                   &attr.cq.mlx5));
        if (tmpl->cq == NULL) {
                ERROR("%p: CQ creation failure", (void *)rxq_ctrl);
                goto error;
@@ -929,6 +941,8 @@ mlx5_priv_rxq_new(struct priv *priv, uint16_t idx, uint16_t desc,
        if (priv->hw_csum_l2tun)
                tmpl->rxq.csum_l2tun =
                        !!dev->data->dev_conf.rxmode.hw_ip_checksum;
+       tmpl->rxq.hw_timestamp =
+                       !!dev->data->dev_conf.rxmode.hw_timestamp;
        /* Configure VLAN stripping. */
        tmpl->rxq.vlan_strip = (priv->hw_vlan_strip &&
                               !!dev->data->dev_conf.rxmode.hw_vlan_strip);