net/mlx5: fs, split software and IFC flow destination definitions

Separate flow destinations between software and IFC.
Flow destination type passed by callers was used as the input in
firmware commands and over the years software only types were added
which resulted in mixing between the two.

Create an IFC enum that contains only the flow destinations defined
when talking to the firmware.

Now that there is a proper software only enum for flow destinations
the hardcoded values can be removed as the values are no longer used
in firmware commands.

Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Reviewed-by: Maor Gottlieb <maorg@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
index 33e9f86cf7d48911ad2ac2f9da103cfad5727966..a5662cb46660b411f2ef07c79c03efdd30f6e509 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
@@ -571,7 +571,9 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev,
                int list_size = 0;
 
                list_for_each_entry(dst, &fte->node.children, node.list) {
-                       unsigned int id, type = dst->dest_attr.type;
+                       enum mlx5_flow_destination_type type = dst->dest_attr.type;
+                       enum mlx5_ifc_flow_destination_type ifc_type;
+                       unsigned int id;
 
                        if (type == MLX5_FLOW_DESTINATION_TYPE_COUNTER)
                                continue;
@@ -579,10 +581,11 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev,
                        switch (type) {
                        case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM:
                                id = dst->dest_attr.ft_num;
-                               type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
+                               ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_FLOW_TABLE;
                                break;
                        case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE:
                                id = dst->dest_attr.ft->id;
+                               ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_FLOW_TABLE;
                                break;
                        case MLX5_FLOW_DESTINATION_TYPE_UPLINK:
                        case MLX5_FLOW_DESTINATION_TYPE_VPORT:
@@ -596,8 +599,10 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev,
                                if (type == MLX5_FLOW_DESTINATION_TYPE_UPLINK) {
                                        /* destination_id is reserved */
                                        id = 0;
+                                       ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_UPLINK;
                                        break;
                                }
+                               ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_VPORT;
                                id = dst->dest_attr.vport.num;
                                if (extended_dest &&
                                    dst->dest_attr.vport.pkt_reformat) {
@@ -612,13 +617,15 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev,
                                break;
                        case MLX5_FLOW_DESTINATION_TYPE_FLOW_SAMPLER:
                                id = dst->dest_attr.sampler_id;
+                               ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_FLOW_SAMPLER;
                                break;
                        default:
                                id = dst->dest_attr.tir_num;
+                               ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_TIR;
                        }
 
                        MLX5_SET(dest_format_struct, in_dests, destination_type,
-                                type);
+                                ifc_type);
                        MLX5_SET(dest_format_struct, in_dests, destination_id, id);
                        in_dests += dst_cnt_size;
                        list_size++;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c
index 4dd619d238cc0594227a9127e31a30df926f8d61..728ccb950fec55bb175742d1597e64ff9ed17a4c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c
@@ -311,7 +311,7 @@ int mlx5dr_cmd_set_fte_modify_and_vport(struct mlx5_core_dev *mdev,
 
        in_dests = MLX5_ADDR_OF(flow_context, in_flow_context, destination);
        MLX5_SET(dest_format_struct, in_dests, destination_type,
-                MLX5_FLOW_DESTINATION_TYPE_VPORT);
+                MLX5_IFC_FLOW_DESTINATION_TYPE_VPORT);
        MLX5_SET(dest_format_struct, in_dests, destination_id, vport);
 
        err = mlx5_cmd_exec(mdev, in, inlen, out, sizeof(out));
@@ -719,7 +719,9 @@ int mlx5dr_cmd_set_fte(struct mlx5_core_dev *dev,
                int list_size = 0;
 
                for (i = 0; i < fte->dests_size; i++) {
-                       unsigned int id, type = fte->dest_arr[i].type;
+                       enum mlx5_flow_destination_type type = fte->dest_arr[i].type;
+                       enum mlx5_ifc_flow_destination_type ifc_type;
+                       unsigned int id;
 
                        if (type == MLX5_FLOW_DESTINATION_TYPE_COUNTER)
                                continue;
@@ -727,10 +729,12 @@ int mlx5dr_cmd_set_fte(struct mlx5_core_dev *dev,
                        switch (type) {
                        case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM:
                                id = fte->dest_arr[i].ft_num;
-                               type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
+                               ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_FLOW_TABLE;
                                break;
                        case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE:
                                id = fte->dest_arr[i].ft_id;
+                               ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_FLOW_TABLE;
+
                                break;
                        case MLX5_FLOW_DESTINATION_TYPE_UPLINK:
                        case MLX5_FLOW_DESTINATION_TYPE_VPORT:
@@ -740,8 +744,10 @@ int mlx5dr_cmd_set_fte(struct mlx5_core_dev *dev,
                                                 destination_eswitch_owner_vhca_id_valid,
                                                 !!(fte->dest_arr[i].vport.flags &
                                                    MLX5_FLOW_DEST_VPORT_VHCA_ID));
+                                       ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_VPORT;
                                } else {
                                        id = 0;
+                                       ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_UPLINK;
                                        MLX5_SET(dest_format_struct, in_dests,
                                                 destination_eswitch_owner_vhca_id_valid, 1);
                                }
@@ -761,13 +767,15 @@ int mlx5dr_cmd_set_fte(struct mlx5_core_dev *dev,
                                break;
                        case MLX5_FLOW_DESTINATION_TYPE_FLOW_SAMPLER:
                                id = fte->dest_arr[i].sampler_id;
+                               ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_FLOW_SAMPLER;
                                break;
                        default:
                                id = fte->dest_arr[i].tir_num;
+                               ifc_type = MLX5_IFC_FLOW_DESTINATION_TYPE_TIR;
                        }
 
                        MLX5_SET(dest_format_struct, in_dests, destination_type,
-                                type);
+                                ifc_type);
                        MLX5_SET(dest_format_struct, in_dests, destination_id, id);
                        in_dests += dst_cnt_size;
                        list_size++;

diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
index e3bfed68b08a15a95c37621a8c1e42675131e5b1..9da9df9ae7511ad646e7f0f065cae6c266613264 100644 (file)
--- a/include/linux/mlx5/fs.h
+++ b/include/linux/mlx5/fs.h
@@ -40,6 +40,17 @@
 
 #define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)
 
+enum mlx5_flow_destination_type {
+       MLX5_FLOW_DESTINATION_TYPE_VPORT,
+       MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE,
+       MLX5_FLOW_DESTINATION_TYPE_TIR,
+       MLX5_FLOW_DESTINATION_TYPE_FLOW_SAMPLER,
+       MLX5_FLOW_DESTINATION_TYPE_UPLINK,
+       MLX5_FLOW_DESTINATION_TYPE_PORT,
+       MLX5_FLOW_DESTINATION_TYPE_COUNTER,
+       MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM,
+};
+
 enum {
        MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO  = 1 << 16,
        MLX5_FLOW_CONTEXT_ACTION_ENCRYPT        = 1 << 17,

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 7d2d0ba8214419ff7f12e9af5e7d9277dd3d1c98..7f4ec9faa1809eb46c9f504f0f84c362642d3c94 100644 (file)
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -1806,16 +1806,12 @@ struct mlx5_ifc_cmd_hca_cap_2_bits {
        u8         reserved_at_c0[0x740];
 };
 
-enum mlx5_flow_destination_type {
-       MLX5_FLOW_DESTINATION_TYPE_VPORT        = 0x0,
-       MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE   = 0x1,
-       MLX5_FLOW_DESTINATION_TYPE_TIR          = 0x2,
-       MLX5_FLOW_DESTINATION_TYPE_FLOW_SAMPLER = 0x6,
-       MLX5_FLOW_DESTINATION_TYPE_UPLINK       = 0x8,
-
-       MLX5_FLOW_DESTINATION_TYPE_PORT         = 0x99,
-       MLX5_FLOW_DESTINATION_TYPE_COUNTER      = 0x100,
-       MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM = 0x101,
+enum mlx5_ifc_flow_destination_type {
+       MLX5_IFC_FLOW_DESTINATION_TYPE_VPORT        = 0x0,
+       MLX5_IFC_FLOW_DESTINATION_TYPE_FLOW_TABLE   = 0x1,
+       MLX5_IFC_FLOW_DESTINATION_TYPE_TIR          = 0x2,
+       MLX5_IFC_FLOW_DESTINATION_TYPE_FLOW_SAMPLER = 0x6,
+       MLX5_IFC_FLOW_DESTINATION_TYPE_UPLINK       = 0x8,
 };
 
 enum mlx5_flow_table_miss_action {