net/mlx5: PD and UAR commands via mlx5 ifc

Remove old representation of manually created PD/UAR commands layouts
and use mlx5_ifc canonical structures and defines.

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pd.c b/drivers/net/ethernet/mellanox/mlx5/core/pd.c
index f2d3aee909e8be2051c8d7f8207c50856b93e394..efe452c30a8d11a5ad74636046dfb6a1804e7531 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/pd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pd.c
@@ -36,66 +36,32 @@
 #include <linux/mlx5/cmd.h>
 #include "mlx5_core.h"
 
-struct mlx5_alloc_pd_mbox_in {
-       struct mlx5_inbox_hdr   hdr;
-       u8                      rsvd[8];
-};
-
-struct mlx5_alloc_pd_mbox_out {
-       struct mlx5_outbox_hdr  hdr;
-       __be32                  pdn;
-       u8                      rsvd[4];
-};
-
-struct mlx5_dealloc_pd_mbox_in {
-       struct mlx5_inbox_hdr   hdr;
-       __be32                  pdn;
-       u8                      rsvd[4];
-};
-
-struct mlx5_dealloc_pd_mbox_out {
-       struct mlx5_outbox_hdr  hdr;
-       u8                      rsvd[8];
-};
-
 int mlx5_core_alloc_pd(struct mlx5_core_dev *dev, u32 *pdn)
 {
-       struct mlx5_alloc_pd_mbox_in    in;
-       struct mlx5_alloc_pd_mbox_out   out;
+       u32 out[MLX5_ST_SZ_DW(alloc_pd_out)] = {0};
+       u32 in[MLX5_ST_SZ_DW(alloc_pd_in)]   = {0};
        int err;
 
-       memset(&in, 0, sizeof(in));
-       memset(&out, 0, sizeof(out));
-       in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_ALLOC_PD);
-       err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));
+       MLX5_SET(alloc_pd_in, in, opcode, MLX5_CMD_OP_ALLOC_PD);
+       err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
+       err = err ? : mlx5_cmd_status_to_err_v2(out);
        if (err)
                return err;
 
-       if (out.hdr.status)
-               return mlx5_cmd_status_to_err(&out.hdr);
-
-       *pdn = be32_to_cpu(out.pdn) & 0xffffff;
+       *pdn = MLX5_GET(alloc_pd_out, out, pd);
        return err;
 }
 EXPORT_SYMBOL(mlx5_core_alloc_pd);
 
 int mlx5_core_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn)
 {
-       struct mlx5_dealloc_pd_mbox_in  in;
-       struct mlx5_dealloc_pd_mbox_out out;
+       u32 out[MLX5_ST_SZ_DW(dealloc_pd_out)] = {0};
+       u32 in[MLX5_ST_SZ_DW(dealloc_pd_in)]   = {0};
        int err;
 
-       memset(&in, 0, sizeof(in));
-       memset(&out, 0, sizeof(out));
-       in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_DEALLOC_PD);
-       in.pdn = cpu_to_be32(pdn);
-       err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));
-       if (err)
-               return err;
-
-       if (out.hdr.status)
-               return mlx5_cmd_status_to_err(&out.hdr);
-
-       return err;
+       MLX5_SET(dealloc_pd_in, in, opcode, MLX5_CMD_OP_DEALLOC_PD);
+       MLX5_SET(dealloc_pd_in, in, pd, pdn);
+       err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
+       return err ? : mlx5_cmd_status_to_err_v2(out);
 }
 EXPORT_SYMBOL(mlx5_core_dealloc_pd);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/uar.c b/drivers/net/ethernet/mellanox/mlx5/core/uar.c
index 5ff8af472bf5221e736e5369b4de73bfe996b0e9..d0a0e0bc77e48d5a4fadb7be923bb885e3dad7c8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/uar.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/uar.c
@@ -42,73 +42,33 @@ enum {
        NUM_LOW_LAT_UUARS       = 4,
 };
 
-
-struct mlx5_alloc_uar_mbox_in {
-       struct mlx5_inbox_hdr   hdr;
-       u8                      rsvd[8];
-};
-
-struct mlx5_alloc_uar_mbox_out {
-       struct mlx5_outbox_hdr  hdr;
-       __be32                  uarn;
-       u8                      rsvd[4];
-};
-
-struct mlx5_free_uar_mbox_in {
-       struct mlx5_inbox_hdr   hdr;
-       __be32                  uarn;
-       u8                      rsvd[4];
-};
-
-struct mlx5_free_uar_mbox_out {
-       struct mlx5_outbox_hdr  hdr;
-       u8                      rsvd[8];
-};
-
 int mlx5_cmd_alloc_uar(struct mlx5_core_dev *dev, u32 *uarn)
 {
-       struct mlx5_alloc_uar_mbox_in   in;
-       struct mlx5_alloc_uar_mbox_out  out;
+       u32 out[MLX5_ST_SZ_DW(alloc_uar_out)] = {0};
+       u32 in[MLX5_ST_SZ_DW(alloc_uar_in)]   = {0};
        int err;
 
-       memset(&in, 0, sizeof(in));
-       memset(&out, 0, sizeof(out));
-       in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_ALLOC_UAR);
-       err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));
+       MLX5_SET(alloc_uar_in, in, opcode, MLX5_CMD_OP_ALLOC_UAR);
+       err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
+       err = err ? : mlx5_cmd_status_to_err_v2(out);
        if (err)
-               goto ex;
-
-       if (out.hdr.status) {
-               err = mlx5_cmd_status_to_err(&out.hdr);
-               goto ex;
-       }
-
-       *uarn = be32_to_cpu(out.uarn) & 0xffffff;
+               return err;
 
-ex:
+       *uarn = MLX5_GET(alloc_uar_out, out, uar);
        return err;
 }
 EXPORT_SYMBOL(mlx5_cmd_alloc_uar);
 
 int mlx5_cmd_free_uar(struct mlx5_core_dev *dev, u32 uarn)
 {
-       struct mlx5_free_uar_mbox_in    in;
-       struct mlx5_free_uar_mbox_out   out;
+       u32 out[MLX5_ST_SZ_DW(dealloc_uar_out)] = {0};
+       u32 in[MLX5_ST_SZ_DW(dealloc_uar_in)]   = {0};
        int err;
 
-       memset(&in, 0, sizeof(in));
-       memset(&out, 0, sizeof(out));
-       in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_DEALLOC_UAR);
-       in.uarn = cpu_to_be32(uarn);
-       err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));
-       if (err)
-               goto ex;
-
-       if (out.hdr.status)
-               err = mlx5_cmd_status_to_err(&out.hdr);
-
-ex:
-       return err;
+       MLX5_SET(dealloc_uar_in, in, opcode, MLX5_CMD_OP_DEALLOC_UAR);
+       MLX5_SET(dealloc_uar_in, in, uar, uarn);
+       err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
+       return err ? : mlx5_cmd_status_to_err_v2(out);
 }
 EXPORT_SYMBOL(mlx5_cmd_free_uar);