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

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

mlxsw: Move "used_kvd_sizes" check to mlxsw_pci_config_profile 



The check should be done directly in mlxsw_pci_config_profile, as for
other profile items. Also, be consistent in naming with the rest and
rename to "used_kvd_sizes".

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 64f45888

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

+1 −2
Original line number Diff line number Diff line
@@ -235,8 +235,7 @@ struct mlxsw_config_profile { 
		used_max_pkey:1,

		used_ar_sec:1,

		used_adaptive_routing_group_cap:1,

		used_kvd_split_data:1; /* indicate for the kvd's values */



		used_kvd_sizes:1;

	u8	max_vepa_channels;

	u16	max_mid;

	u16	max_pgt;

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

+1 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ static int mlxsw_pci_config_profile(struct mlxsw_pci *mlxsw_pci, char *mbox, 
		mlxsw_cmd_mbox_config_profile_adaptive_routing_group_cap_set(

			mbox, profile->adaptive_routing_group_cap);

	}

	if (MLXSW_RES_VALID(res, KVD_SIZE)) {

	if (profile->used_kvd_sizes && MLXSW_RES_VALID(res, KVD_SIZE)) {

		err = mlxsw_pci_profile_get_kvd_sizes(mlxsw_pci, profile, res);

		if (err)

			return err;

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

+2 −3
Original line number Diff line number Diff line
@@ -3793,7 +3793,7 @@ static const struct mlxsw_config_profile mlxsw_sp_config_profile = { 
	.max_ib_mc			= 0,

	.used_max_pkey			= 1,

	.max_pkey			= 0,

	.used_kvd_split_data		= 1,

	.used_kvd_sizes			= 1,

	.kvd_hash_single_parts		= 59,

	.kvd_hash_double_parts		= 41,

	.kvd_linear_size		= MLXSW_SP_KVD_LINEAR_SIZE,
@@ -3934,8 +3934,7 @@ static int mlxsw_sp_kvd_sizes_get(struct mlxsw_core *mlxsw_core, 
	int err;



	if (!MLXSW_CORE_RES_VALID(mlxsw_core, KVD_SINGLE_MIN_SIZE) ||

	    !MLXSW_CORE_RES_VALID(mlxsw_core, KVD_DOUBLE_MIN_SIZE) ||

	    !profile->used_kvd_split_data)

	    !MLXSW_CORE_RES_VALID(mlxsw_core, KVD_DOUBLE_MIN_SIZE))

		return -EIO;



	/* The hash part is what left of the kvd without the