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

Commit aa99bc70 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum_buffers: Rename "pool" to "pr" in initialization 



Be consintent with rest of the registers (pm, cm) and use "pr" here.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b11c3b40

drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c

+35 −35
Original line number Diff line number Diff line
@@ -128,75 +128,75 @@ static int mlxsw_sp_port_headroom_init(struct mlxsw_sp_port *mlxsw_sp_port) 
	return mlxsw_sp_port_pb_prio_init(mlxsw_sp_port);

}



struct mlxsw_sp_sb_pool {

struct mlxsw_sp_sb_pr {

	enum mlxsw_reg_sbpr_mode mode;

	u32 size;

};



#define MLXSW_SP_SB_POOL_INGRESS_SIZE				\

#define MLXSW_SP_SB_PR_INGRESS_SIZE				\

	(15000000 - (2 * 20000 * MLXSW_PORT_MAX_PORTS))

#define MLXSW_SP_SB_POOL_EGRESS_SIZE				\

#define MLXSW_SP_SB_PR_EGRESS_SIZE				\

	(14000000 - (8 * 1500 * MLXSW_PORT_MAX_PORTS))



#define MLXSW_SP_SB_POOL(_mode, _size)	\

#define MLXSW_SP_SB_PR(_mode, _size)	\

	{				\

		.mode = _mode,		\

		.size = _size,		\

	}



static const struct mlxsw_sp_sb_pool mlxsw_sp_sb_pools_ingress[] = {

	MLXSW_SP_SB_POOL(MLXSW_REG_SBPR_MODE_DYNAMIC,

			 MLXSW_SP_BYTES_TO_CELLS(MLXSW_SP_SB_POOL_INGRESS_SIZE)),

	MLXSW_SP_SB_POOL(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),

	MLXSW_SP_SB_POOL(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),

	MLXSW_SP_SB_POOL(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),

static const struct mlxsw_sp_sb_pr mlxsw_sp_sb_prs_ingress[] = {

	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC,

		       MLXSW_SP_BYTES_TO_CELLS(MLXSW_SP_SB_PR_INGRESS_SIZE)),

	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),

	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),

	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),

};



#define MLXSW_SP_SB_POOLS_INGRESS_LEN ARRAY_SIZE(mlxsw_sp_sb_pools_ingress)

#define MLXSW_SP_SB_PRS_INGRESS_LEN ARRAY_SIZE(mlxsw_sp_sb_prs_ingress)



static const struct mlxsw_sp_sb_pool mlxsw_sp_sb_pools_egress[] = {

	MLXSW_SP_SB_POOL(MLXSW_REG_SBPR_MODE_DYNAMIC,

			 MLXSW_SP_BYTES_TO_CELLS(MLXSW_SP_SB_POOL_EGRESS_SIZE)),

	MLXSW_SP_SB_POOL(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),

	MLXSW_SP_SB_POOL(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),

	MLXSW_SP_SB_POOL(MLXSW_REG_SBPR_MODE_DYNAMIC,

			 MLXSW_SP_BYTES_TO_CELLS(MLXSW_SP_SB_POOL_EGRESS_SIZE)),

static const struct mlxsw_sp_sb_pr mlxsw_sp_sb_prs_egress[] = {

	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC,

		       MLXSW_SP_BYTES_TO_CELLS(MLXSW_SP_SB_PR_EGRESS_SIZE)),

	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),

	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC, 0),

	MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_DYNAMIC,

		       MLXSW_SP_BYTES_TO_CELLS(MLXSW_SP_SB_PR_EGRESS_SIZE)),

};



#define MLXSW_SP_SB_POOLS_EGRESS_LEN ARRAY_SIZE(mlxsw_sp_sb_pools_egress)

#define MLXSW_SP_SB_PRS_EGRESS_LEN ARRAY_SIZE(mlxsw_sp_sb_prs_egress)



static int __mlxsw_sp_sb_pools_init(struct mlxsw_sp *mlxsw_sp,

static int __mlxsw_sp_sb_prs_init(struct mlxsw_sp *mlxsw_sp,

				  enum mlxsw_reg_sbxx_dir dir,

				    const struct mlxsw_sp_sb_pool *pools,

				    size_t pools_len)

				  const struct mlxsw_sp_sb_pr *prs,

				  size_t prs_len)

{

	int i;

	int err;



	for (i = 0; i < pools_len; i++) {

		const struct mlxsw_sp_sb_pool *pool;

	for (i = 0; i < prs_len; i++) {

		const struct mlxsw_sp_sb_pr *pr;



		pool = &pools[i];

		pr = &prs[i];

		err = mlxsw_sp_sb_pr_write(mlxsw_sp, i, dir,

					   pool->mode, pool->size);

					   pr->mode, pr->size);

		if (err)

			return err;

	}

	return 0;

}



static int mlxsw_sp_sb_pools_init(struct mlxsw_sp *mlxsw_sp)

static int mlxsw_sp_sb_prs_init(struct mlxsw_sp *mlxsw_sp)

{

	int err;



	err = __mlxsw_sp_sb_pools_init(mlxsw_sp, MLXSW_REG_SBXX_DIR_INGRESS,

				       mlxsw_sp_sb_pools_ingress,

				       MLXSW_SP_SB_POOLS_INGRESS_LEN);

	err = __mlxsw_sp_sb_prs_init(mlxsw_sp, MLXSW_REG_SBXX_DIR_INGRESS,

				     mlxsw_sp_sb_prs_ingress,

				     MLXSW_SP_SB_PRS_INGRESS_LEN);

	if (err)

		return err;

	return __mlxsw_sp_sb_pools_init(mlxsw_sp, MLXSW_REG_SBXX_DIR_EGRESS,

					mlxsw_sp_sb_pools_egress,

					MLXSW_SP_SB_POOLS_EGRESS_LEN);

	return __mlxsw_sp_sb_prs_init(mlxsw_sp, MLXSW_REG_SBXX_DIR_EGRESS,

				      mlxsw_sp_sb_prs_egress,

				      MLXSW_SP_SB_PRS_EGRESS_LEN);

}



struct mlxsw_sp_sb_cm {
@@ -460,7 +460,7 @@ int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp) 
{

	int err;



	err = mlxsw_sp_sb_pools_init(mlxsw_sp);

	err = mlxsw_sp_sb_prs_init(mlxsw_sp);

	if (err)

		return err;

	err = mlxsw_sp_cpu_port_sb_cms_init(mlxsw_sp);