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

Commit c2e7490c authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Flip driver to use emulated 802.1Q FIDs 



Replace 802.1Q FIDs and VLAN RIFs with their emulated counterparts.

The emulated 802.1Q FIDs are actually 802.1D FIDs and thus use the same
flood tables, of per-FID type. Therefore, add 4K-1 entries to the
per-FID flood tables for the new FIDs and get rid of the FID-offset
flood tables that were used by the old 802.1Q FIDs.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba6da02a

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

+8 −6
Original line number Diff line number Diff line
@@ -4111,16 +4111,20 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core) 
	mlxsw_sp_kvdl_fini(mlxsw_sp);

}



/* Per-FID flood tables are used for both "true" 802.1D FIDs and emulated

 * 802.1Q FIDs

 */

#define MLXSW_SP_FID_FLOOD_TABLE_SIZE	(MLXSW_SP_FID_8021D_MAX + \

					 VLAN_VID_MASK - 1)



static const struct mlxsw_config_profile mlxsw_sp1_config_profile = {

	.used_max_mid			= 1,

	.max_mid			= MLXSW_SP_MID_MAX,

	.used_flood_tables		= 1,

	.used_flood_mode		= 1,

	.flood_mode			= 3,

	.max_fid_offset_flood_tables	= 3,

	.fid_offset_flood_table_size	= VLAN_N_VID - 1,

	.max_fid_flood_tables		= 3,

	.fid_flood_table_size		= MLXSW_SP_FID_8021D_MAX,

	.fid_flood_table_size		= MLXSW_SP_FID_FLOOD_TABLE_SIZE,

	.used_max_ib_mc			= 1,

	.max_ib_mc			= 0,

	.used_max_pkey			= 1,
@@ -4143,10 +4147,8 @@ static const struct mlxsw_config_profile mlxsw_sp2_config_profile = { 
	.used_flood_tables		= 1,

	.used_flood_mode		= 1,

	.flood_mode			= 3,

	.max_fid_offset_flood_tables	= 3,

	.fid_offset_flood_table_size	= VLAN_N_VID - 1,

	.max_fid_flood_tables		= 3,

	.fid_flood_table_size		= MLXSW_SP_FID_8021D_MAX,

	.fid_flood_table_size		= MLXSW_SP_FID_FLOOD_TABLE_SIZE,

	.used_max_ib_mc			= 1,

	.max_ib_mc			= 0,

	.used_max_pkey			= 1,

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

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ static const struct mlxsw_sp_fid_family mlxsw_sp_fid_dummy_family = { 
};



static const struct mlxsw_sp_fid_family *mlxsw_sp_fid_family_arr[] = {

	[MLXSW_SP_FID_TYPE_8021Q]	= &mlxsw_sp_fid_8021q_family,

	[MLXSW_SP_FID_TYPE_8021Q]	= &mlxsw_sp_fid_8021q_emu_family,

	[MLXSW_SP_FID_TYPE_8021D]	= &mlxsw_sp_fid_8021d_family,

	[MLXSW_SP_FID_TYPE_RFID]	= &mlxsw_sp_fid_rfid_family,

	[MLXSW_SP_FID_TYPE_DUMMY]	= &mlxsw_sp_fid_dummy_family,

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

+1 −1
Original line number Diff line number Diff line
@@ -7373,7 +7373,7 @@ static const struct mlxsw_sp_rif_ops mlxsw_sp_rif_ipip_lb_ops = { 


static const struct mlxsw_sp_rif_ops *mlxsw_sp_rif_ops_arr[] = {

	[MLXSW_SP_RIF_TYPE_SUBPORT]	= &mlxsw_sp_rif_subport_ops,

	[MLXSW_SP_RIF_TYPE_VLAN]	= &mlxsw_sp_rif_vlan_ops,

	[MLXSW_SP_RIF_TYPE_VLAN]	= &mlxsw_sp_rif_vlan_emu_ops,

	[MLXSW_SP_RIF_TYPE_FID]		= &mlxsw_sp_rif_fid_ops,

	[MLXSW_SP_RIF_TYPE_IPIP_LB]	= &mlxsw_sp_rif_ipip_lb_ops,

};