remove unnecessary null checks

[dpdk.git] / drivers / regex / mlx5 / mlx5_regex_devx.c

diff --git a/drivers/regex/mlx5/mlx5_regex_devx.c b/drivers/regex/mlx5/mlx5_regex_devx.c
index f66d7aa..a8aa64c 100644 (file)
--- a/drivers/regex/mlx5/mlx5_regex_devx.c
+++ b/drivers/regex/mlx5/mlx5_regex_devx.c
@@ -13,98 +13,8 @@
 #include "mlx5_regex_utils.h"
 
 int
-mlx5_devx_regex_register_write(struct ibv_context *ctx, int engine_id,
-                              uint32_t addr, uint32_t data)
-{
-       uint32_t out[MLX5_ST_SZ_DW(set_regexp_register_out)] = {0};
-       uint32_t in[MLX5_ST_SZ_DW(set_regexp_register_in)] = {0};
-       int ret;
-
-       MLX5_SET(set_regexp_register_in, in, opcode,
-                MLX5_CMD_SET_REGEX_REGISTERS);
-       MLX5_SET(set_regexp_register_in, in, engine_id, engine_id);
-       MLX5_SET(set_regexp_register_in, in, register_address, addr);
-       MLX5_SET(set_regexp_register_in, in, register_data, data);
-
-       ret = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out,
-                                         sizeof(out));
-       if (ret) {
-               DRV_LOG(ERR, "Set regexp register failed %d", ret);
-               rte_errno = errno;
-               return -errno;
-       }
-       return 0;
-}
-
-int
-mlx5_devx_regex_register_read(struct ibv_context *ctx, int engine_id,
-                             uint32_t addr, uint32_t *data)
-{
-       uint32_t out[MLX5_ST_SZ_DW(query_regexp_register_out)] = {0};
-       uint32_t in[MLX5_ST_SZ_DW(query_regexp_register_in)] = {0};
-       int ret;
-
-       MLX5_SET(query_regexp_register_in, in, opcode,
-                MLX5_CMD_QUERY_REGEX_REGISTERS);
-       MLX5_SET(query_regexp_register_in, in, engine_id, engine_id);
-       MLX5_SET(query_regexp_register_in, in, register_address, addr);
-
-       ret = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out,
-                                         sizeof(out));
-       if (ret) {
-               DRV_LOG(ERR, "Query regexp register failed %d", ret);
-               rte_errno = errno;
-               return -errno;
-       }
-       *data = MLX5_GET(query_regexp_register_out, out, register_data);
-       return 0;
-}
-
-int
-mlx5_devx_regex_database_stop(void *ctx, uint8_t engine)
-{
-       uint32_t out[MLX5_ST_SZ_DW(set_regexp_params_out)] = {0};
-       uint32_t in[MLX5_ST_SZ_DW(set_regexp_params_in)] = {0};
-       int ret;
-
-       MLX5_SET(set_regexp_params_in, in, opcode, MLX5_CMD_SET_REGEX_PARAMS);
-       MLX5_SET(set_regexp_params_in, in, engine_id, engine);
-       MLX5_SET(set_regexp_params_in, in, regexp_params.stop_engine, 1);
-       MLX5_SET(set_regexp_params_in, in, field_select.stop_engine, 1);
-       ret = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out,
-                                         sizeof(out));
-       if (ret) {
-               DRV_LOG(ERR, "Database stop failed %d", ret);
-               rte_errno = errno;
-               return -errno;
-       }
-       return 0;
-}
-
-int
-mlx5_devx_regex_database_resume(void *ctx, uint8_t engine)
-{
-       uint32_t out[MLX5_ST_SZ_DW(set_regexp_params_out)] = {0};
-       uint32_t in[MLX5_ST_SZ_DW(set_regexp_params_in)] = {0};
-       int ret;
-
-       MLX5_SET(set_regexp_params_in, in, opcode, MLX5_CMD_SET_REGEX_PARAMS);
-       MLX5_SET(set_regexp_params_in, in, engine_id, engine);
-       MLX5_SET(set_regexp_params_in, in, regexp_params.stop_engine, 0);
-       MLX5_SET(set_regexp_params_in, in, field_select.stop_engine, 1);
-       ret = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out,
-                                         sizeof(out));
-       if (ret) {
-               DRV_LOG(ERR, "Database start failed %d", ret);
-               rte_errno = errno;
-               return -errno;
-       }
-       return 0;
-}
-
-int
-mlx5_devx_regex_database_program(void *ctx, uint8_t engine, uint32_t umem_id,
-                                uint64_t umem_offset)
+mlx5_devx_regex_rules_program(void *ctx, uint8_t engine, uint32_t rof_mkey,
+                               uint32_t rof_size, uint64_t rof_mkey_va)
 {
        uint32_t out[MLX5_ST_SZ_DW(set_regexp_params_out)] = {0};
        uint32_t in[MLX5_ST_SZ_DW(set_regexp_params_in)] = {0};
@@ -112,14 +22,15 @@ mlx5_devx_regex_database_program(void *ctx, uint8_t engine, uint32_t umem_id,
 
        MLX5_SET(set_regexp_params_in, in, opcode, MLX5_CMD_SET_REGEX_PARAMS);
        MLX5_SET(set_regexp_params_in, in, engine_id, engine);
-       MLX5_SET(set_regexp_params_in, in, regexp_params.db_umem_id, umem_id);
-       MLX5_SET64(set_regexp_params_in, in, regexp_params.db_umem_offset,
-                  umem_offset);
-       MLX5_SET(set_regexp_params_in, in, field_select.db_umem_id, 1);
+       MLX5_SET(set_regexp_params_in, in, regexp_params.rof_mkey, rof_mkey);
+       MLX5_SET(set_regexp_params_in, in, regexp_params.rof_size, rof_size);
+       MLX5_SET64(set_regexp_params_in, in, regexp_params.rof_mkey_va,
+                  rof_mkey_va);
+       MLX5_SET(set_regexp_params_in, in, field_select.rof_mkey, 1);
        ret = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out,
                                          sizeof(out));
        if (ret) {
-               DRV_LOG(ERR, "Database program failed %d", ret);
+               DRV_LOG(ERR, "Rules program failed %d", ret);
                rte_errno = errno;
                return -errno;
        }