Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d4fb5dc authored by Yonatan Cohen's avatar Yonatan Cohen Committed by Leon Romanovsky
Browse files

net/mlx5: Limit scope of dump_fill_mkey function 



mlx5_core_dump_fill_mkey() is going to be used in next
patch in IB and doesn't need to be visible to whole
mlx5_core. Move that command to mlx5_ib.

Signed-off-by: default avatarYonatan Cohen <yonatanc@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent b30408d7

drivers/infiniband/hw/mlx5/cmd.c

+15 −0
Original line number Diff line number Diff line
@@ -32,6 +32,21 @@ 


#include "cmd.h"



int mlx5_cmd_dump_fill_mkey(struct mlx5_core_dev *dev, u32 *mkey)

{

	u32 out[MLX5_ST_SZ_DW(query_special_contexts_out)] = {0};

	u32 in[MLX5_ST_SZ_DW(query_special_contexts_in)]   = {0};

	int err;



	MLX5_SET(query_special_contexts_in, in, opcode,

		 MLX5_CMD_OP_QUERY_SPECIAL_CONTEXTS);

	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	if (!err)

		*mkey = MLX5_GET(query_special_contexts_out, out,

				 dump_fill_mkey);

	return err;

}



int mlx5_cmd_null_mkey(struct mlx5_core_dev *dev, u32 *null_mkey)

{

	u32 out[MLX5_ST_SZ_DW(query_special_contexts_out)] = {};

drivers/infiniband/hw/mlx5/cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/kernel.h>

#include <linux/mlx5/driver.h>



int mlx5_cmd_dump_fill_mkey(struct mlx5_core_dev *dev, u32 *mkey);

int mlx5_cmd_null_mkey(struct mlx5_core_dev *dev, u32 *null_mkey);

int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point,

			       void *out, int out_size);

drivers/net/ethernet/mellanox/mlx5/core/mr.c

+0 −17
Original line number Diff line number Diff line
@@ -146,23 +146,6 @@ int mlx5_core_query_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mkey *mkey, 
}

EXPORT_SYMBOL(mlx5_core_query_mkey);



int mlx5_core_dump_fill_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mkey *_mkey,

			     u32 *mkey)

{

	u32 out[MLX5_ST_SZ_DW(query_special_contexts_out)] = {0};

	u32 in[MLX5_ST_SZ_DW(query_special_contexts_in)]   = {0};

	int err;



	MLX5_SET(query_special_contexts_in, in, opcode,

		 MLX5_CMD_OP_QUERY_SPECIAL_CONTEXTS);

	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	if (!err)

		*mkey = MLX5_GET(query_special_contexts_out, out,

				 dump_fill_mkey);

	return err;

}

EXPORT_SYMBOL(mlx5_core_dump_fill_mkey);



static inline u32 mlx5_get_psv(u32 *out, int psv_index)

{

	switch (psv_index) {

include/linux/mlx5/driver.h

+0 −2
Original line number Diff line number Diff line
@@ -1067,8 +1067,6 @@ int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev, 
			   struct mlx5_core_mkey *mkey);

int mlx5_core_query_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mkey *mkey,

			 u32 *out, int outlen);

int mlx5_core_dump_fill_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mkey *_mkey,

			     u32 *mkey);

int mlx5_core_alloc_pd(struct mlx5_core_dev *dev, u32 *pdn);

int mlx5_core_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn);

int mlx5_core_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,