net/mlx5: Init/Teardown hca commands via mlx5 ifc

Remove old representation of manually created Init/Teardown hca
commands layout 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/fw.c b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
index 77fc1aa261148e5784a1dd342181cd2f6ec5b754..56bf520d14298e9000fd5cb5b195f424b8227959 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
@@ -162,38 +162,22 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev)
 
 int mlx5_cmd_init_hca(struct mlx5_core_dev *dev)
 {
-       struct mlx5_cmd_init_hca_mbox_in in;
-       struct mlx5_cmd_init_hca_mbox_out out;
+       u32 out[MLX5_ST_SZ_DW(init_hca_out)] = {0};
+       u32 in[MLX5_ST_SZ_DW(init_hca_in)]   = {0};
        int err;
 
-       memset(&in, 0, sizeof(in));
-       memset(&out, 0, sizeof(out));
-       in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_INIT_HCA);
-       err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));
-       if (err)
-               return err;
-
-       if (out.hdr.status)
-               err = mlx5_cmd_status_to_err(&out.hdr);
-
-       return err;
+       MLX5_SET(init_hca_in, in, opcode, MLX5_CMD_OP_INIT_HCA);
+       err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
+       return err ? : mlx5_cmd_status_to_err_v2(out);
 }
 
 int mlx5_cmd_teardown_hca(struct mlx5_core_dev *dev)
 {
-       struct mlx5_cmd_teardown_hca_mbox_in in;
-       struct mlx5_cmd_teardown_hca_mbox_out out;
+       u32 out[MLX5_ST_SZ_DW(teardown_hca_out)] = {0};
+       u32 in[MLX5_ST_SZ_DW(teardown_hca_in)]   = {0};
        int err;
 
-       memset(&in, 0, sizeof(in));
-       memset(&out, 0, sizeof(out));
-       in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_TEARDOWN_HCA);
-       err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));
-       if (err)
-               return err;
-
-       if (out.hdr.status)
-               err = mlx5_cmd_status_to_err(&out.hdr);
-
-       return err;
+       MLX5_SET(teardown_hca_in, in, opcode, MLX5_CMD_OP_TEARDOWN_HCA);
+       err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
+       return err ? : mlx5_cmd_status_to_err_v2(out);
 }

diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 0b6d15cddb2f73fa049f72cb11f1ec7e8bfef058..6c343c0b77d2af8bac06b3ece8012b0cf0f7e5a2 100644 (file)
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -455,30 +455,6 @@ struct mlx5_odp_caps {
        char reserved2[0xe4];
 };
 
-struct mlx5_cmd_init_hca_mbox_in {
-       struct mlx5_inbox_hdr   hdr;
-       u8                      rsvd0[2];
-       __be16                  profile;
-       u8                      rsvd1[4];
-};
-
-struct mlx5_cmd_init_hca_mbox_out {
-       struct mlx5_outbox_hdr  hdr;
-       u8                      rsvd[8];
-};
-
-struct mlx5_cmd_teardown_hca_mbox_in {
-       struct mlx5_inbox_hdr   hdr;
-       u8                      rsvd0[2];
-       __be16                  profile;
-       u8                      rsvd1[4];
-};
-
-struct mlx5_cmd_teardown_hca_mbox_out {
-       struct mlx5_outbox_hdr  hdr;
-       u8                      rsvd[8];
-};
-
 struct mlx5_cmd_layout {
        u8              type;
        u8              rsvd0[3];