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

Commit 51d3c08e authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

mlxsw: spectrum_kvdl: Add support for linear division resources 



The linear part of the KVD memory is sub-divided into multiple parts. This
patch exposes this internal partitions via the resource interface.

Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f4bbf7c

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

+4 −0
Original line number Diff line number Diff line
@@ -3885,6 +3885,10 @@ static int mlxsw_sp_resources_register(struct mlxsw_core *mlxsw_core) 
	if (err)

		return err;



	err = mlxsw_sp_kvdl_resources_register(devlink);

	if  (err)

		return err;



	double_size = kvd_size - linear_size;

	double_size *= profile->kvd_hash_double_parts;

	double_size /= profile->kvd_hash_double_parts +

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

+7 −0
Original line number Diff line number Diff line
@@ -70,12 +70,18 @@ 
#define MLXSW_SP_RESOURCE_NAME_KVD_LINEAR "linear"

#define MLXSW_SP_RESOURCE_NAME_KVD_HASH_SINGLE "hash_single"

#define MLXSW_SP_RESOURCE_NAME_KVD_HASH_DOUBLE "hash_double"

#define MLXSW_SP_RESOURCE_NAME_KVD_LINEAR_SINGLES "singles"

#define MLXSW_SP_RESOURCE_NAME_KVD_LINEAR_CHUNKS "chunks"

#define MLXSW_SP_RESOURCE_NAME_KVD_LINEAR_LARGE_CHUNKS "large_chunks"



enum mlxsw_sp_resource_id {

	MLXSW_SP_RESOURCE_KVD,

	MLXSW_SP_RESOURCE_KVD_LINEAR,

	MLXSW_SP_RESOURCE_KVD_HASH_SINGLE,

	MLXSW_SP_RESOURCE_KVD_HASH_DOUBLE,

	MLXSW_SP_RESOURCE_KVD_LINEAR_SINGLE,

	MLXSW_SP_RESOURCE_KVD_LINEAR_CHUNKS,

	MLXSW_SP_RESOURCE_KVD_LINEAR_LARGE_CHUNKS,

};



struct mlxsw_sp_port;
@@ -433,6 +439,7 @@ int mlxsw_sp_kvdl_alloc_size_query(struct mlxsw_sp *mlxsw_sp, 
				   unsigned int entry_count,

				   unsigned int *p_alloc_size);

u64 mlxsw_sp_kvdl_occ_get(const struct mlxsw_sp *mlxsw_sp);

int mlxsw_sp_kvdl_resources_register(struct devlink *devlink);



struct mlxsw_sp_acl_rule_info {

	unsigned int priority;

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

+74 −3
Original line number Diff line number Diff line
@@ -188,21 +188,27 @@ int mlxsw_sp_kvdl_alloc_size_query(struct mlxsw_sp *mlxsw_sp, 
	return 0;

}



enum mlxsw_sp_kvdl_part_id {

	MLXSW_SP_KVDL_PART_SINGLE,

	MLXSW_SP_KVDL_PART_CHUNKS,

	MLXSW_SP_KVDL_PART_LARGE_CHUNKS,

};



static const struct mlxsw_sp_kvdl_part_info kvdl_parts_info[] = {

	{

		.part_index	= 0,

		.part_index	= MLXSW_SP_KVDL_PART_SINGLE,

		.start_index	= MLXSW_SP_KVDL_SINGLE_BASE,

		.end_index	= MLXSW_SP_KVDL_SINGLE_END,

		.alloc_size	= 1,

	},

	{

		.part_index	= 1,

		.part_index	= MLXSW_SP_KVDL_PART_CHUNKS,

		.start_index	= MLXSW_SP_KVDL_CHUNKS_BASE,

		.end_index	= MLXSW_SP_KVDL_CHUNKS_END,

		.alloc_size	= MLXSW_SP_CHUNK_MAX,

	},

	{

		.part_index	= 2,

		.part_index	= MLXSW_SP_KVDL_PART_LARGE_CHUNKS,

		.start_index	= MLXSW_SP_KVDL_LARGE_CHUNKS_BASE,

		.end_index	= MLXSW_SP_KVDL_LARGE_CHUNKS_END,

		.alloc_size	= MLXSW_SP_LARGE_CHUNK_MAX,
@@ -312,6 +318,71 @@ u64 mlxsw_sp_kvdl_occ_get(const struct mlxsw_sp *mlxsw_sp) 
	return occ;

}



static struct devlink_resource_size_params mlxsw_sp_kvdl_single_size_params = {

	.size_min = 0,

	.size_granularity = 1,

	.unit = DEVLINK_RESOURCE_UNIT_ENTRY,

};



static struct devlink_resource_size_params mlxsw_sp_kvdl_chunks_size_params = {

	.size_min = 0,

	.size_granularity = MLXSW_SP_CHUNK_MAX,

	.unit = DEVLINK_RESOURCE_UNIT_ENTRY,

};



static struct devlink_resource_size_params mlxsw_sp_kvdl_large_chunks_size_params = {

	.size_min = 0,

	.size_granularity = MLXSW_SP_LARGE_CHUNK_MAX,

	.unit = DEVLINK_RESOURCE_UNIT_ENTRY,

};



static void

mlxsw_sp_kvdl_resource_size_params_prepare(struct devlink *devlink)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

	u32 kvdl_max_size;



	kvdl_max_size = MLXSW_CORE_RES_GET(mlxsw_core, KVD_SIZE) -

			MLXSW_CORE_RES_GET(mlxsw_core, KVD_SINGLE_MIN_SIZE) -

			MLXSW_CORE_RES_GET(mlxsw_core, KVD_DOUBLE_MIN_SIZE);



	mlxsw_sp_kvdl_single_size_params.size_max = kvdl_max_size;

	mlxsw_sp_kvdl_chunks_size_params.size_max = kvdl_max_size;

	mlxsw_sp_kvdl_large_chunks_size_params.size_max = kvdl_max_size;

}



int mlxsw_sp_kvdl_resources_register(struct devlink *devlink)

{

	int err;



	mlxsw_sp_kvdl_resource_size_params_prepare(devlink);

	err = devlink_resource_register(devlink, MLXSW_SP_RESOURCE_NAME_KVD_LINEAR_SINGLES,

					false, MLXSW_SP_KVDL_SINGLE_SIZE,

					MLXSW_SP_RESOURCE_KVD_LINEAR_SINGLE,

					MLXSW_SP_RESOURCE_KVD_LINEAR,

					&mlxsw_sp_kvdl_single_size_params,

					NULL);

	if (err)

		return err;



	err = devlink_resource_register(devlink, MLXSW_SP_RESOURCE_NAME_KVD_LINEAR_CHUNKS,

					false, MLXSW_SP_KVDL_CHUNKS_SIZE,

					MLXSW_SP_RESOURCE_KVD_LINEAR_CHUNKS,

					MLXSW_SP_RESOURCE_KVD_LINEAR,

					&mlxsw_sp_kvdl_chunks_size_params,

					NULL);

	if (err)

		return err;



	err = devlink_resource_register(devlink, MLXSW_SP_RESOURCE_NAME_KVD_LINEAR_LARGE_CHUNKS,

					false, MLXSW_SP_KVDL_LARGE_CHUNKS_SIZE,

					MLXSW_SP_RESOURCE_KVD_LINEAR_LARGE_CHUNKS,

					MLXSW_SP_RESOURCE_KVD_LINEAR,

					&mlxsw_sp_kvdl_large_chunks_size_params,

					NULL);

	return err;

}



int mlxsw_sp_kvdl_init(struct mlxsw_sp *mlxsw_sp)

{

	struct mlxsw_sp_kvdl *kvdl;