Commit 70b34c77 authored by Amit Cohen's avatar Amit Cohen Committed by David S. Miller
Browse files

mlxsw: Add enumerator for 'config_profile.flood_mode' 



Currently magic constant is used for setting 'flood_mode' as part of
config profile.

As preparation for unified bridge model, which will require different
'flood_mode', add a dedicated enumerator for this field and use it as
part of 'struct mlxsw_config_profile'.

Add the relevant value for unified bridge model.

Signed-off-by: default avatarAmit Cohen <amcohen@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0100f840

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

+15 −6
Original line number Diff line number Diff line
@@ -713,14 +713,23 @@ MLXSW_ITEM32(cmd_mbox, config_profile, max_flood_tables, 0x30, 16, 4); 
 */

MLXSW_ITEM32(cmd_mbox, config_profile, max_vid_flood_tables, 0x30, 8, 4);



/* cmd_mbox_config_profile_flood_mode

 * Flooding mode to use.

 * 0-2 - Backward compatible modes for SwitchX devices.

 * 3 - Mixed mode, where:

enum mlxsw_cmd_mbox_config_profile_flood_mode {

	/* Mixed mode, where:

	 * max_flood_tables indicates the number of single-entry tables.

	 * max_vid_flood_tables indicates the number of per-VID tables.

 * max_fid_offset_flood_tables indicates the number of FID-offset tables.

 * max_fid_flood_tables indicates the number of per-FID tables.

	 * max_fid_offset_flood_tables indicates the number of FID-offset

	 * tables. max_fid_flood_tables indicates the number of per-FID tables.

	 * Reserved when unified bridge model is used.

	 */

	MLXSW_CMD_MBOX_CONFIG_PROFILE_FLOOD_MODE_MIXED = 3,

	/* Controlled flood tables. Reserved when legacy bridge model is

	 * used.

	 */

	MLXSW_CMD_MBOX_CONFIG_PROFILE_FLOOD_MODE_CONTROLLED = 4,

};



/* cmd_mbox_config_profile_flood_mode

 * Flooding mode to use.

 */

MLXSW_ITEM32(cmd_mbox, config_profile, flood_mode, 0x30, 0, 2);

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

+2 −2
Original line number Diff line number Diff line
@@ -3376,7 +3376,7 @@ static const struct mlxsw_config_profile mlxsw_sp1_config_profile = { 
	.max_mid			= MLXSW_SP_MID_MAX,

	.used_flood_tables		= 1,

	.used_flood_mode		= 1,

	.flood_mode			= 3,

	.flood_mode			= MLXSW_CMD_MBOX_CONFIG_PROFILE_FLOOD_MODE_MIXED,

	.max_fid_flood_tables		= 3,

	.fid_flood_table_size		= MLXSW_SP_FID_FLOOD_TABLE_SIZE,

	.used_max_ib_mc			= 1,
@@ -3400,7 +3400,7 @@ static const struct mlxsw_config_profile mlxsw_sp2_config_profile = { 
	.max_mid			= MLXSW_SP_MID_MAX,

	.used_flood_tables		= 1,

	.used_flood_mode		= 1,

	.flood_mode			= 3,

	.flood_mode			= MLXSW_CMD_MBOX_CONFIG_PROFILE_FLOOD_MODE_MIXED,

	.max_fid_flood_tables		= 3,

	.fid_flood_table_size		= MLXSW_SP_FID_FLOOD_TABLE_SIZE,

	.used_max_ib_mc			= 1,