Merge tag 'v5.18' into rdma.git for-next

[platform/kernel/linux-starfive.git] / drivers / net / ethernet / mellanox / mlx5 / core / fs_core.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 3ad67e6..b68fb62 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -40,8 +40,6 @@
 #include "fs_cmd.h"
 #include "fs_ft_pool.h"
 #include "diag/fs_tracepoint.h"
-#include "accel/ipsec.h"
-#include "fpga/ipsec.h"
 
 #define INIT_TREE_NODE_ARRAY_SIZE(...) (sizeof((struct init_tree_node[]){__VA_ARGS__}) /\
                                         sizeof(struct init_tree_node))
@@ -188,24 +186,18 @@ static struct init_tree_node {
 
 static struct init_tree_node egress_root_fs = {
        .type = FS_TYPE_NAMESPACE,
-#ifdef CONFIG_MLX5_IPSEC
        .ar_size = 2,
-#else
-       .ar_size = 1,
-#endif
        .children = (struct init_tree_node[]) {
                ADD_PRIO(0, MLX5_BY_PASS_NUM_PRIOS, 0,
                         FS_CHAINING_CAPS_EGRESS,
                         ADD_NS(MLX5_FLOW_TABLE_MISS_ACTION_DEF,
                                ADD_MULTIPLE_PRIO(MLX5_BY_PASS_NUM_PRIOS,
                                                  BY_PASS_PRIO_NUM_LEVELS))),
-#ifdef CONFIG_MLX5_IPSEC
                ADD_PRIO(0, KERNEL_TX_MIN_LEVEL, 0,
                         FS_CHAINING_CAPS_EGRESS,
                         ADD_NS(MLX5_FLOW_TABLE_MISS_ACTION_DEF,
                                ADD_MULTIPLE_PRIO(KERNEL_TX_IPSEC_NUM_PRIOS,
                                                  KERNEL_TX_IPSEC_NUM_LEVELS))),
-#endif
        }
 };
 
@@ -2519,10 +2511,6 @@ static struct mlx5_flow_root_namespace
        struct mlx5_flow_root_namespace *root_ns;
        struct mlx5_flow_namespace *ns;
 
-       if (mlx5_fpga_ipsec_device_caps(steering->dev) & MLX5_ACCEL_IPSEC_CAP_DEVICE &&
-           (table_type == FS_FT_NIC_RX || table_type == FS_FT_NIC_TX))
-               cmds = mlx5_fs_cmd_get_default_ipsec_fpga_cmds(table_type);
-
        /* Create the root namespace */
        root_ns = kzalloc(sizeof(*root_ns), GFP_KERNEL);
        if (!root_ns)
@@ -3135,8 +3123,7 @@ int mlx5_fs_core_init(struct mlx5_core_dev *dev)
                        goto err;
        }
 
-       if (mlx5_fpga_ipsec_device_caps(steering->dev) & MLX5_ACCEL_IPSEC_CAP_DEVICE ||
-           MLX5_CAP_FLOWTABLE_NIC_TX(dev, ft_support)) {
+       if (MLX5_CAP_FLOWTABLE_NIC_TX(dev, ft_support)) {
                err = init_egress_root_ns(steering);
                if (err)
                        goto err;