mlx5_{ib,core}: Add query SQ state helper function

Move query SQ state function from mlx5_ib to mlx5_core in order to
have it in shared code.

It will be used in a downstream patch from mlx5e.

Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

3 files changed, 27 insertions, 13 deletions

diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 85c612ac547a..0d0b0b8dad98 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -4739,26 +4739,14 @@ static int query_raw_packet_qp_sq_state(struct mlx5_ib_dev *dev,
                                         struct mlx5_ib_sq *sq,
                                         u8 *sq_state)
 {
-        void *out;
-        void *sqc;
-        int inlen;
         int err;
 
-        inlen = MLX5_ST_SZ_BYTES(query_sq_out);
-        out = kvzalloc(inlen, GFP_KERNEL);
-        if (!out)
-                return -ENOMEM;
-
-        err = mlx5_core_query_sq(dev->mdev, sq->base.mqp.qpn, out);
+        err = mlx5_core_query_sq_state(dev->mdev, sq->base.mqp.qpn, sq_state);
         if (err)
                 goto out;
-
-        sqc = MLX5_ADDR_OF(query_sq_out, out, sq_context);
-        *sq_state = MLX5_GET(sqc, sqc, state);
         sq->state = *sq_state;
 
 out:
-        kvfree(out);
         return err;
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/transobj.c b/drivers/net/ethernet/mellanox/mlx5/core/transobj.c
index 9e38343a951f..c64957b5ef47 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/transobj.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/transobj.c
@@ -157,6 +157,31 @@ int mlx5_core_query_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *out)
 }
 EXPORT_SYMBOL(mlx5_core_query_sq);
 
+int mlx5_core_query_sq_state(struct mlx5_core_dev *dev, u32 sqn, u8 *state)
+{
+        void *out;
+        void *sqc;
+        int inlen;
+        int err;
+
+        inlen = MLX5_ST_SZ_BYTES(query_sq_out);
+        out = kvzalloc(inlen, GFP_KERNEL);
+        if (!out)
+                return -ENOMEM;
+
+        err = mlx5_core_query_sq(dev, sqn, out);
+        if (err)
+                goto out;
+
+        sqc = MLX5_ADDR_OF(query_sq_out, out, sq_context);
+        *state = MLX5_GET(sqc, sqc, state);
+
+out:
+        kvfree(out);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx5_core_query_sq_state);
+
 int mlx5_core_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen,
                          u32 *tirn)
 {
diff --git a/include/linux/mlx5/transobj.h b/include/linux/mlx5/transobj.h
index 7e8f281f8c00..80d7aa8b2831 100644
--- a/include/linux/mlx5/transobj.h
+++ b/include/linux/mlx5/transobj.h
@@ -47,6 +47,7 @@ int mlx5_core_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen,
 int mlx5_core_modify_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *in, int inlen);
 void mlx5_core_destroy_sq(struct mlx5_core_dev *dev, u32 sqn);
 int mlx5_core_query_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *out);
+int mlx5_core_query_sq_state(struct mlx5_core_dev *dev, u32 sqn, u8 *state);
 int mlx5_core_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen,
                          u32 *tirn);
 int mlx5_core_modify_tir(struct mlx5_core_dev *dev, u32 tirn, u32 *in,