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

Commit 7db22ffb authored by Haggai Abramonvsky's avatar Haggai Abramonvsky Committed by David S. Miller
Browse files

net/mlx5_core: Apply proper name convention to helpers 



Some core helper functions were named with mlx5_ only prefix, fix that to
mlx5_core_ so we're aligned with the overall scheme used for core services.

Signed-off-by: default avatarHaggai Abramovsky <hagaya@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e24851e

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

+10 −10
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static int mlx5e_enable_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param) 
	mlx5_fill_page_array(&rq->wq_ctrl.buf,

			     (__be64 *)MLX5_ADDR_OF(wq, wq, pas));



	err = mlx5_create_rq(mdev, in, inlen, &rq->rqn);

	err = mlx5_core_create_rq(mdev, in, inlen, &rq->rqn);



	kvfree(in);
@@ -395,7 +395,7 @@ static int mlx5e_modify_rq(struct mlx5e_rq *rq, int curr_state, int next_state) 
	MLX5_SET(modify_rq_in, in, rq_state, curr_state);

	MLX5_SET(rqc, rqc, state, next_state);



	err = mlx5_modify_rq(mdev, rq->rqn, in, inlen);

	err = mlx5_core_modify_rq(mdev, rq->rqn, in, inlen);



	kvfree(in);
@@ -408,7 +408,7 @@ static void mlx5e_disable_rq(struct mlx5e_rq *rq) 
	struct mlx5e_priv *priv = c->priv;

	struct mlx5_core_dev *mdev = priv->mdev;



	mlx5_destroy_rq(mdev, rq->rqn);

	mlx5_core_destroy_rq(mdev, rq->rqn);

}



static int mlx5e_wait_for_min_rx_wqes(struct mlx5e_rq *rq)
@@ -596,7 +596,7 @@ static int mlx5e_enable_sq(struct mlx5e_sq *sq, struct mlx5e_sq_param *param) 
	mlx5_fill_page_array(&sq->wq_ctrl.buf,

			     (__be64 *)MLX5_ADDR_OF(wq, wq, pas));



	err = mlx5_create_sq(mdev, in, inlen, &sq->sqn);

	err = mlx5_core_create_sq(mdev, in, inlen, &sq->sqn);



	kvfree(in);
@@ -624,7 +624,7 @@ static int mlx5e_modify_sq(struct mlx5e_sq *sq, int curr_state, int next_state) 
	MLX5_SET(modify_sq_in, in, sq_state, curr_state);

	MLX5_SET(sqc, sqc, state, next_state);



	err = mlx5_modify_sq(mdev, sq->sqn, in, inlen);

	err = mlx5_core_modify_sq(mdev, sq->sqn, in, inlen);



	kvfree(in);
@@ -637,7 +637,7 @@ static void mlx5e_disable_sq(struct mlx5e_sq *sq) 
	struct mlx5e_priv *priv = c->priv;

	struct mlx5_core_dev *mdev = priv->mdev;



	mlx5_destroy_sq(mdev, sq->sqn);

	mlx5_core_destroy_sq(mdev, sq->sqn);

}



static int mlx5e_open_sq(struct mlx5e_channel *c,
@@ -1115,12 +1115,12 @@ static int mlx5e_open_tis(struct mlx5e_priv *priv, int tc) 


	MLX5_SET(tisc, tisc, prio,  tc);



	return mlx5_create_tis(mdev, in, sizeof(in), &priv->tisn[tc]);

	return mlx5_core_create_tis(mdev, in, sizeof(in), &priv->tisn[tc]);

}



static void mlx5e_close_tis(struct mlx5e_priv *priv, int tc)

{

	mlx5_destroy_tis(priv->mdev, priv->tisn[tc]);

	mlx5_core_destroy_tis(priv->mdev, priv->tisn[tc]);

}



static int mlx5e_open_tises(struct mlx5e_priv *priv)
@@ -1326,7 +1326,7 @@ static int mlx5e_open_tir(struct mlx5e_priv *priv, int tt) 


	mlx5e_build_tir_ctx(priv, tirc, tt);



	err = mlx5_create_tir(mdev, in, inlen, &priv->tirn[tt]);

	err = mlx5_core_create_tir(mdev, in, inlen, &priv->tirn[tt]);



	kvfree(in);
@@ -1335,7 +1335,7 @@ static int mlx5e_open_tir(struct mlx5e_priv *priv, int tt) 


static void mlx5e_close_tir(struct mlx5e_priv *priv, int tt)

{

	mlx5_destroy_tir(priv->mdev, priv->tirn[tt]);

	mlx5_core_destroy_tir(priv->mdev, priv->tirn[tt]);

}



static int mlx5e_open_tirs(struct mlx5e_priv *priv)

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

+12 −10
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "mlx5_core.h"

#include "transobj.h"



int mlx5_create_rq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *rqn)

int mlx5_core_create_rq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *rqn)

{

	u32 out[MLX5_ST_SZ_DW(create_rq_out)];

	int err;
@@ -49,7 +49,7 @@ int mlx5_create_rq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *rqn) 
	return err;

}



int mlx5_modify_rq(struct mlx5_core_dev *dev, u32 rqn, u32 *in, int inlen)

int mlx5_core_modify_rq(struct mlx5_core_dev *dev, u32 rqn, u32 *in, int inlen)

{

	u32 out[MLX5_ST_SZ_DW(modify_rq_out)];
@@ -60,7 +60,7 @@ int mlx5_modify_rq(struct mlx5_core_dev *dev, u32 rqn, u32 *in, int inlen) 
	return mlx5_cmd_exec_check_status(dev, in, inlen, out, sizeof(out));

}



void mlx5_destroy_rq(struct mlx5_core_dev *dev, u32 rqn)

void mlx5_core_destroy_rq(struct mlx5_core_dev *dev, u32 rqn)

{

	u32 in[MLX5_ST_SZ_DW(destroy_rq_in)];

	u32 out[MLX5_ST_SZ_DW(destroy_rq_out)];
@@ -73,7 +73,7 @@ void mlx5_destroy_rq(struct mlx5_core_dev *dev, u32 rqn) 
	mlx5_cmd_exec_check_status(dev, in, sizeof(in), out, sizeof(out));

}



int mlx5_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *sqn)

int mlx5_core_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *sqn)

{

	u32 out[MLX5_ST_SZ_DW(create_sq_out)];

	int err;
@@ -88,7 +88,7 @@ int mlx5_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *sqn) 
	return err;

}



int mlx5_modify_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *in, int inlen)

int mlx5_core_modify_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *in, int inlen)

{

	u32 out[MLX5_ST_SZ_DW(modify_sq_out)];
@@ -99,7 +99,7 @@ int mlx5_modify_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *in, int inlen) 
	return mlx5_cmd_exec_check_status(dev, in, inlen, out, sizeof(out));

}



void mlx5_destroy_sq(struct mlx5_core_dev *dev, u32 sqn)

void mlx5_core_destroy_sq(struct mlx5_core_dev *dev, u32 sqn)

{

	u32 in[MLX5_ST_SZ_DW(destroy_sq_in)];

	u32 out[MLX5_ST_SZ_DW(destroy_sq_out)];
@@ -112,7 +112,8 @@ void mlx5_destroy_sq(struct mlx5_core_dev *dev, u32 sqn) 
	mlx5_cmd_exec_check_status(dev, in, sizeof(in), out, sizeof(out));

}



int mlx5_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tirn)

int mlx5_core_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen,

			 u32 *tirn)

{

	u32 out[MLX5_ST_SZ_DW(create_tir_out)];

	int err;
@@ -127,7 +128,7 @@ int mlx5_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tirn) 
	return err;

}



void mlx5_destroy_tir(struct mlx5_core_dev *dev, u32 tirn)

void mlx5_core_destroy_tir(struct mlx5_core_dev *dev, u32 tirn)

{

	u32 in[MLX5_ST_SZ_DW(destroy_tir_out)];

	u32 out[MLX5_ST_SZ_DW(destroy_tir_out)];
@@ -140,7 +141,8 @@ void mlx5_destroy_tir(struct mlx5_core_dev *dev, u32 tirn) 
	mlx5_cmd_exec_check_status(dev, in, sizeof(in), out, sizeof(out));

}



int mlx5_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tisn)

int mlx5_core_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen,

			 u32 *tisn)

{

	u32 out[MLX5_ST_SZ_DW(create_tis_out)];

	int err;
@@ -155,7 +157,7 @@ int mlx5_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tisn) 
	return err;

}



void mlx5_destroy_tis(struct mlx5_core_dev *dev, u32 tisn)

void mlx5_core_destroy_tis(struct mlx5_core_dev *dev, u32 tisn)

{

	u32 in[MLX5_ST_SZ_DW(destroy_tis_out)];

	u32 out[MLX5_ST_SZ_DW(destroy_tis_out)];

drivers/net/ethernet/mellanox/mlx5/core/transobj.h

+14 −10
Original line number Diff line number Diff line
@@ -33,15 +33,19 @@ 
#ifndef __TRANSOBJ_H__

#define __TRANSOBJ_H__



int mlx5_create_rq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *rqn);

int mlx5_modify_rq(struct mlx5_core_dev *dev, u32 rqn, u32 *in, int inlen);

void mlx5_destroy_rq(struct mlx5_core_dev *dev, u32 rqn);

int mlx5_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *sqn);

int mlx5_modify_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *in, int inlen);

void mlx5_destroy_sq(struct mlx5_core_dev *dev, u32 sqn);

int mlx5_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tirn);

void mlx5_destroy_tir(struct mlx5_core_dev *dev, u32 tirn);

int mlx5_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tisn);

void mlx5_destroy_tis(struct mlx5_core_dev *dev, u32 tisn);

int mlx5_core_create_rq(struct mlx5_core_dev *dev, u32 *in, int inlen,

			u32 *rqn);

int mlx5_core_modify_rq(struct mlx5_core_dev *dev, u32 rqn, u32 *in, int inlen);

void mlx5_core_destroy_rq(struct mlx5_core_dev *dev, u32 rqn);

int mlx5_core_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen,

			u32 *sqn);

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_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen,

			 u32 *tirn);

void mlx5_core_destroy_tir(struct mlx5_core_dev *dev, u32 tirn);

int mlx5_core_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen,

			 u32 *tisn);

void mlx5_core_destroy_tis(struct mlx5_core_dev *dev, u32 tisn);



#endif /* __TRANSOBJ_H__ */