net/mlx5: EQ add/del CQ API

Add API to add/del CQ to/from EQs CQ table to be used in cq.c upon CQ
creation/destruction, as CQ table is now private to eq.c.

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Reviewed-by: Gal Pressman <galp@mellanox.com>

3 files changed, 53 insertions, 45 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cq.c b/drivers/net/ethernet/mellanox/mlx5/core/cq.c
index 9feeb555e937..f6e478d05ecc 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cq.c
@@ -137,22 +137,17 @@ void mlx5_cq_event(struct mlx5_eq *eq, u32 cqn, int event_type)
 int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,
                         u32 *in, int inlen)
 {
+        int eqn = MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context), c_eqn);
+        u32 dout[MLX5_ST_SZ_DW(destroy_cq_out)];
         u32 out[MLX5_ST_SZ_DW(create_cq_out)];
         u32 din[MLX5_ST_SZ_DW(destroy_cq_in)];
-        u32 dout[MLX5_ST_SZ_DW(destroy_cq_out)];
-        int eqn = MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context),
-                           c_eqn);
-        struct mlx5_eq *eq, *async_eq;
-        struct mlx5_cq_table *table;
+        struct mlx5_eq *eq;
         int err;
 
-        async_eq = &dev->priv.eq_table.async_eq;
         eq = mlx5_eqn2eq(dev, eqn);
         if (IS_ERR(eq))
                 return PTR_ERR(eq);
 
-        table = &eq->cq_table;
-
         memset(out, 0, sizeof(out));
         MLX5_SET(create_cq_in, in, opcode, MLX5_CMD_OP_CREATE_CQ);
         err = mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));
@@ -172,18 +167,14 @@ int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,
         INIT_LIST_HEAD(&cq->tasklet_ctx.list);
 
         /* Add to comp EQ CQ tree to recv comp events */
-        spin_lock_irq(&table->lock);
-        err = radix_tree_insert(&table->tree, cq->cqn, cq);
-        spin_unlock_irq(&table->lock);
+        err = mlx5_eq_add_cq(eq, cq);
         if (err)
                 goto err_cmd;
 
-        /* Add to async EQ CQ tree to recv Async events */
-        spin_lock_irq(&async_eq->cq_table.lock);
-        err = radix_tree_insert(&async_eq->cq_table.tree, cq->cqn, cq);
-        spin_unlock_irq(&async_eq->cq_table.lock);
+        /* Add to async EQ CQ tree to recv async events */
+        err = mlx5_eq_add_cq(&dev->priv.eq_table.async_eq, cq);
         if (err)
-                goto err_cq_table;
+                goto err_cq_add;
 
         cq->pid = current->pid;
         err = mlx5_debug_cq_add(dev, cq);
@@ -195,10 +186,8 @@ int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,
 
         return 0;
 
-err_cq_table:
-        spin_lock_irq(&table->lock);
-        radix_tree_delete(&table->tree, cq->cqn);
-        spin_unlock_irq(&table->lock);
+err_cq_add:
+        mlx5_eq_del_cq(eq, cq);
 err_cmd:
         memset(din, 0, sizeof(din));
         memset(dout, 0, sizeof(dout));
@@ -211,36 +200,17 @@ EXPORT_SYMBOL(mlx5_core_create_cq);
 
 int mlx5_core_destroy_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq)
 {
-        struct mlx5_cq_table *asyn_eq_cq_table = &dev->priv.eq_table.async_eq.cq_table;
-        struct mlx5_cq_table *table = &cq->eq->cq_table;
         u32 out[MLX5_ST_SZ_DW(destroy_cq_out)] = {0};
         u32 in[MLX5_ST_SZ_DW(destroy_cq_in)] = {0};
-        struct mlx5_core_cq *tmp;
         int err;
 
-        spin_lock_irq(&asyn_eq_cq_table->lock);
-        tmp = radix_tree_delete(&asyn_eq_cq_table->tree, cq->cqn);
-        spin_unlock_irq(&asyn_eq_cq_table->lock);
-        if (!tmp) {
-                mlx5_core_warn(dev, "cq 0x%x not found in async eq cq tree\n", cq->cqn);
-                return -EINVAL;
-        }
-        if (tmp != cq) {
-                mlx5_core_warn(dev, "corruption on cqn 0x%x in async eq cq tree\n", cq->cqn);
-                return -EINVAL;
-        }
+        err = mlx5_eq_del_cq(&dev->priv.eq_table.async_eq, cq);
+        if (err)
+                return err;
 
-        spin_lock_irq(&table->lock);
-        tmp = radix_tree_delete(&table->tree, cq->cqn);
-        spin_unlock_irq(&table->lock);
-        if (!tmp) {
-                mlx5_core_warn(dev, "cq 0x%x not found in comp eq cq tree\n", cq->cqn);
-                return -EINVAL;
-        }
-        if (tmp != cq) {
-                mlx5_core_warn(dev, "corruption on cqn 0x%x in comp eq cq tree\n", cq->cqn);
-                return -EINVAL;
-        }
+        err = mlx5_eq_del_cq(cq->eq, cq);
+        if (err)
+                return err;
 
         MLX5_SET(destroy_cq_in, in, opcode, MLX5_CMD_OP_DESTROY_CQ);
         MLX5_SET(destroy_cq_in, in, cqn, cq->cqn);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index 328403ebf2f5..c1f0468e95bd 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -704,6 +704,40 @@ int mlx5_destroy_unmap_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq)
 }
 EXPORT_SYMBOL_GPL(mlx5_destroy_unmap_eq);
 
+int mlx5_eq_add_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq)
+{
+        struct mlx5_cq_table *table = &eq->cq_table;
+        int err;
+
+        spin_lock_irq(&table->lock);
+        err = radix_tree_insert(&table->tree, cq->cqn, cq);
+        spin_unlock_irq(&table->lock);
+
+        return err;
+}
+
+int mlx5_eq_del_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq)
+{
+        struct mlx5_cq_table *table = &eq->cq_table;
+        struct mlx5_core_cq *tmp;
+
+        spin_lock_irq(&table->lock);
+        tmp = radix_tree_delete(&table->tree, cq->cqn);
+        spin_unlock_irq(&table->lock);
+
+        if (!tmp) {
+                mlx5_core_warn(eq->dev, "cq 0x%x not found in eq 0x%x tree\n", eq->eqn, cq->cqn);
+                return -ENOENT;
+        }
+
+        if (tmp != cq) {
+                mlx5_core_warn(eq->dev, "corruption on cqn 0x%x in eq 0x%x\n", eq->eqn, cq->cqn);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 int mlx5_eq_init(struct mlx5_core_dev *dev)
 {
         int err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
index 394552f36fcf..54a1cbfb1b5a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
@@ -38,6 +38,7 @@
 #include <linux/sched.h>
 #include <linux/if_link.h>
 #include <linux/firmware.h>
+#include <linux/mlx5/cq.h>
 
 #define DRIVER_NAME "mlx5_core"
 #define DRIVER_VERSION "5.0-0"
@@ -115,6 +116,9 @@ int mlx5_destroy_scheduling_element_cmd(struct mlx5_core_dev *dev, u8 hierarchy,
                                         u32 element_id);
 int mlx5_wait_for_vf_pages(struct mlx5_core_dev *dev);
 u64 mlx5_read_internal_timer(struct mlx5_core_dev *dev);
+
+int mlx5_eq_add_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq);
+int mlx5_eq_del_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq);
 struct mlx5_eq *mlx5_eqn2eq(struct mlx5_core_dev *dev, int eqn);
 u32 mlx5_eq_poll_irq_disabled(struct mlx5_eq *eq);
 void mlx5_cq_tasklet_cb(unsigned long data);