net/mlx5: update eCPRI flex parser structures

To handle eCPRI protocol in the flows the mlx5 PMD engages
flex parser hardware feature. While we were implementing
eCPRI support we anticipated the flex parser usage extension,
and all related variables were named accordingly, containing
flex syllabus. Now we are preparing to introduce more common
approach of flex item, in order to avoid naming conflicts
and improve the code readability the eCPRI infrastructure
related variables are renamed as preparation step.

Later, once we have the new flex item implemented, we could
consider to refactor the eCPRI protocol support  to move on
common flex item basis.

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 4ba850af263cee86d206af62827d7447c2f9bd9b..cd7bb3f27c4626bd34bb8855f2c789690ecda52c 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -866,8 +866,7 @@ bool
 mlx5_flex_parser_ecpri_exist(struct rte_eth_dev *dev)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_flex_parser_profiles *prf =
-                               &priv->sh->fp[MLX5_FLEX_PARSER_ECPRI_0];
+       struct mlx5_ecpri_parser_profile *prf = &priv->sh->ecpri_parser;
 
        return !!prf->obj;
 }
@@ -886,8 +885,7 @@ int
 mlx5_flex_parser_ecpri_alloc(struct rte_eth_dev *dev)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_flex_parser_profiles *prf =
-                               &priv->sh->fp[MLX5_FLEX_PARSER_ECPRI_0];
+       struct mlx5_ecpri_parser_profile *prf = &priv->sh->ecpri_parser;
        struct mlx5_devx_graph_node_attr node = {
                .modify_field_select = 0,
        };
@@ -950,8 +948,7 @@ static void
 mlx5_flex_parser_ecpri_release(struct rte_eth_dev *dev)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_flex_parser_profiles *prf =
-                               &priv->sh->fp[MLX5_FLEX_PARSER_ECPRI_0];
+       struct mlx5_ecpri_parser_profile *prf = &priv->sh->ecpri_parser;
 
        if (prf->obj)
                mlx5_devx_cmd_destroy(prf->obj);

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 39c001aa1bf7fab2ca2944681860dba70fdb3344..912c4a183bc2c39df80ceeb6371b98efd1c83076 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1013,14 +1013,8 @@ struct mlx5_dev_txpp {
        uint64_t err_ts_future; /* Timestamp in the distant future. */
 };
 
-/* Supported flex parser profile ID. */
-enum mlx5_flex_parser_profile_id {
-       MLX5_FLEX_PARSER_ECPRI_0 = 0,
-       MLX5_FLEX_PARSER_MAX = 8,
-};
-
-/* Sample ID information of flex parser structure. */
-struct mlx5_flex_parser_profiles {
+/* Sample ID information of eCPRI flex parser structure. */
+struct mlx5_ecpri_parser_profile {
        uint32_t num;           /* Actual number of samples. */
        uint32_t ids[8];        /* Sample IDs for this profile. */
        uint8_t offset[8];      /* Bytes offset of each parser. */
@@ -1169,7 +1163,7 @@ struct mlx5_dev_ctx_shared {
        struct mlx5_devx_obj *td; /* Transport domain. */
        struct mlx5_lag lag; /* LAG attributes */
        void *tx_uar; /* Tx/packet pacing shared UAR. */
-       struct mlx5_flex_parser_profiles fp[MLX5_FLEX_PARSER_MAX];
+       struct mlx5_ecpri_parser_profile ecpri_parser;
        /* Flex parser profiles information. */
        void *devx_rx_uar; /* DevX UAR for Rx. */
        struct mlx5_aso_age_mng *aso_age_mng;

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index aaf96fc2974171720b972f6fd181a94cd189d137..1ca9739d7e8d62b5a9363a469faa4ed286868361 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9892,7 +9892,7 @@ flow_dv_translate_item_ecpri(struct rte_eth_dev *dev, void *matcher,
         */
        if (!ecpri_m->hdr.common.u32)
                return;
-       samples = priv->sh->fp[MLX5_FLEX_PARSER_ECPRI_0].ids;
+       samples = priv->sh->ecpri_parser.ids;
        /* Need to take the whole DW as the mask to fill the entry. */
        dw_m = MLX5_ADDR_OF(fte_match_set_misc4, misc4_m,
                            prog_sample_field_value_0);