UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mlxsw: remove kvd_hash_granularity from config profile struct 

This should not be part of the struct, as the struct fields
are tightly coupled with the FW command payload of the same name.
Just use the "granularity" define directly, as in other places.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2018-04-01 17:34:54 +03:00 committed by David S. Miller
parent 4f8768befd
commit 72779c97cf
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/mellanox/mlxsw/core.h
View File

@ -256,7 +256,6 @@ struct mlxsw_config_profile {
u16 adaptive_routing_group_cap; u16 adaptive_routing_group_cap;
u8 arn; u8 arn;
u32 kvd_linear_size; u32 kvd_linear_size;
u16 kvd_hash_granularity;
u8 kvd_hash_single_parts; u8 kvd_hash_single_parts;
u8 kvd_hash_double_parts; u8 kvd_hash_double_parts;
u8 resource_query_enable; u8 resource_query_enable;

5
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
View File

@ -3794,7 +3794,6 @@ static const struct mlxsw_config_profile mlxsw_sp_config_profile = {
.used_max_pkey = 1, .used_max_pkey = 1,
.max_pkey = 0, .max_pkey = 0,
.used_kvd_split_data = 1, .used_kvd_split_data = 1,
.kvd_hash_granularity = MLXSW_SP_KVD_GRANULARITY,
.kvd_hash_single_parts = 59, .kvd_hash_single_parts = 59,
.kvd_hash_double_parts = 41, .kvd_hash_double_parts = 41,
.kvd_linear_size = MLXSW_SP_KVD_LINEAR_SIZE, .kvd_linear_size = MLXSW_SP_KVD_LINEAR_SIZE,
@ -3902,7 +3901,7 @@ static int mlxsw_sp_resources_register(struct mlxsw_core *mlxsw_core)
double_size *= profile->kvd_hash_double_parts; double_size *= profile->kvd_hash_double_parts;
double_size /= profile->kvd_hash_double_parts + double_size /= profile->kvd_hash_double_parts +
profile->kvd_hash_single_parts; profile->kvd_hash_single_parts;
double_size = rounddown(double_size, profile->kvd_hash_granularity); double_size = rounddown(double_size, MLXSW_SP_KVD_GRANULARITY);
err = devlink_resource_register(devlink, MLXSW_SP_RESOURCE_NAME_KVD_HASH_DOUBLE, err = devlink_resource_register(devlink, MLXSW_SP_RESOURCE_NAME_KVD_HASH_DOUBLE,
double_size, double_size,
MLXSW_SP_RESOURCE_KVD_HASH_DOUBLE, MLXSW_SP_RESOURCE_KVD_HASH_DOUBLE,
@ -3962,7 +3961,7 @@ static int mlxsw_sp_kvd_sizes_get(struct mlxsw_core *mlxsw_core,
double_size /= profile->kvd_hash_double_parts + double_size /= profile->kvd_hash_double_parts +
profile->kvd_hash_single_parts; profile->kvd_hash_single_parts;
*p_double_size = rounddown(double_size, *p_double_size = rounddown(double_size,
profile->kvd_hash_granularity); MLXSW_SP_KVD_GRANULARITY);
} }
err = devlink_resource_size_get(devlink, err = devlink_resource_size_get(devlink,