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

mlxsw: spectrum_cnt: Query bank size from FW resources 



The bank size is different between Spectrum versions. Also it is
a resource that can be queried. So instead of hard coding the value in
code, query it from the firmware.

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

drivers/net/ethernet/mellanox/mlxsw/resources.h

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ enum mlxsw_res_id { 
	MLXSW_RES_ID_CQE_V1,

	MLXSW_RES_ID_CQE_V2,

	MLXSW_RES_ID_COUNTER_POOL_SIZE,

	MLXSW_RES_ID_COUNTER_BANK_SIZE,

	MLXSW_RES_ID_MAX_SPAN,

	MLXSW_RES_ID_COUNTER_SIZE_PACKETS_BYTES,

	MLXSW_RES_ID_COUNTER_SIZE_ROUTER_BASIC,
@@ -75,6 +76,7 @@ static u16 mlxsw_res_ids[] = { 
	[MLXSW_RES_ID_CQE_V1] = 0x2211,

	[MLXSW_RES_ID_CQE_V2] = 0x2212,

	[MLXSW_RES_ID_COUNTER_POOL_SIZE] = 0x2410,

	[MLXSW_RES_ID_COUNTER_BANK_SIZE] = 0x2411,

	[MLXSW_RES_ID_MAX_SPAN] = 0x2420,

	[MLXSW_RES_ID_COUNTER_SIZE_PACKETS_BYTES] = 0x2443,

	[MLXSW_RES_ID_COUNTER_SIZE_ROUTER_BASIC] = 0x2449,

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

+9 −6
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 


#include "spectrum_cnt.h"



#define MLXSW_SP_COUNTER_POOL_BANK_SIZE 4096



struct mlxsw_sp_counter_sub_pool {

	unsigned int base_index;

	unsigned int size;
@@ -36,13 +34,15 @@ static int mlxsw_sp_counter_pool_validate(struct mlxsw_sp *mlxsw_sp) 
{

	unsigned int total_bank_config = 0;

	unsigned int pool_size;

	unsigned int bank_size;

	int i;



	pool_size = MLXSW_CORE_RES_GET(mlxsw_sp->core, COUNTER_POOL_SIZE);

	bank_size = MLXSW_CORE_RES_GET(mlxsw_sp->core, COUNTER_BANK_SIZE);

	/* Check config is valid, no bank over subscription */

	for (i = 0; i < ARRAY_SIZE(mlxsw_sp_counter_sub_pools); i++)

		total_bank_config += mlxsw_sp_counter_sub_pools[i].bank_count;

	if (total_bank_config > pool_size / MLXSW_SP_COUNTER_POOL_BANK_SIZE + 1)

	if (total_bank_config > pool_size / bank_size + 1)

		return -EINVAL;

	return 0;

}
@@ -71,11 +71,13 @@ int mlxsw_sp_counter_pool_init(struct mlxsw_sp *mlxsw_sp) 
	struct mlxsw_sp_counter_sub_pool *sub_pool;

	struct mlxsw_sp_counter_pool *pool;

	unsigned int base_index;

	unsigned int bank_size;

	unsigned int map_size;

	int i;

	int err;



	if (!MLXSW_CORE_RES_VALID(mlxsw_sp->core, COUNTER_POOL_SIZE))

	if (!MLXSW_CORE_RES_VALID(mlxsw_sp->core, COUNTER_POOL_SIZE) ||

	    !MLXSW_CORE_RES_VALID(mlxsw_sp->core, COUNTER_BANK_SIZE))

		return -EIO;



	err = mlxsw_sp_counter_pool_validate(mlxsw_sp);
@@ -94,6 +96,8 @@ int mlxsw_sp_counter_pool_init(struct mlxsw_sp *mlxsw_sp) 
	pool->pool_size = MLXSW_CORE_RES_GET(mlxsw_sp->core, COUNTER_POOL_SIZE);

	map_size = BITS_TO_LONGS(pool->pool_size) * sizeof(unsigned long);



	bank_size = MLXSW_CORE_RES_GET(mlxsw_sp->core, COUNTER_BANK_SIZE);



	pool->usage = kzalloc(map_size, GFP_KERNEL);

	if (!pool->usage) {

		err = -ENOMEM;
@@ -107,8 +111,7 @@ int mlxsw_sp_counter_pool_init(struct mlxsw_sp *mlxsw_sp) 
	base_index = 0;

	for (i = 0; i < ARRAY_SIZE(mlxsw_sp_counter_sub_pools); i++) {

		sub_pool = &pool->sub_pools[i];

		sub_pool->size = sub_pool->bank_count *

				 MLXSW_SP_COUNTER_POOL_BANK_SIZE;

		sub_pool->size = sub_pool->bank_count * bank_size;

		sub_pool->base_index = base_index;

		base_index += sub_pool->size;

		/* The last bank can't be fully used */

CRA Git | Maintained and supported by SUSTech CRA and CCSE