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

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

mlxsw: spectrum_switchdev: Don't batch learning operations 



We no longer batch VLAN operations, so there's no need to set the
learning state for a range of VLANs.

Use a common function to set the learning state for a Port-VLAN, thereby
making the code saner more receptive for upcoming changes.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45bfe6b4

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

+4 −12
Original line number Diff line number Diff line
@@ -666,8 +666,7 @@ int mlxsw_sp_port_vid_to_fid_set(struct mlxsw_sp_port *mlxsw_sp_port, 
	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(svfa), svfa_pl);

}



int __mlxsw_sp_port_vid_learning_set(struct mlxsw_sp_port *mlxsw_sp_port,

				     u16 vid_begin, u16 vid_end,

int mlxsw_sp_port_vid_learning_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

				   bool learn_enable)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
@@ -677,20 +676,13 @@ int __mlxsw_sp_port_vid_learning_set(struct mlxsw_sp_port *mlxsw_sp_port, 
	spvmlr_pl = kmalloc(MLXSW_REG_SPVMLR_LEN, GFP_KERNEL);

	if (!spvmlr_pl)

		return -ENOMEM;

	mlxsw_reg_spvmlr_pack(spvmlr_pl, mlxsw_sp_port->local_port, vid_begin,

			      vid_end, learn_enable);

	mlxsw_reg_spvmlr_pack(spvmlr_pl, mlxsw_sp_port->local_port, vid, vid,

			      learn_enable);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(spvmlr), spvmlr_pl);

	kfree(spvmlr_pl);

	return err;

}



int mlxsw_sp_port_vid_learning_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

				   bool learn_enable)

{

	return __mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid, vid,

						learn_enable);

}



static int

mlxsw_sp_port_system_port_mapping_set(struct mlxsw_sp_port *mlxsw_sp_port)

{

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

+0 −3
Original line number Diff line number Diff line
@@ -442,9 +442,6 @@ int __mlxsw_sp_port_headroom_set(struct mlxsw_sp_port *mlxsw_sp_port, int mtu, 
int mlxsw_sp_port_ets_maxrate_set(struct mlxsw_sp_port *mlxsw_sp_port,

				  enum mlxsw_reg_qeec_hr hr, u8 index,

				  u8 next_index, u32 maxrate);

int __mlxsw_sp_port_vid_learning_set(struct mlxsw_sp_port *mlxsw_sp_port,

				     u16 vid_begin, u16 vid_end,

				     bool learn_enable);

int mlxsw_sp_port_vid_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

			      u8 state);

int mlxsw_sp_port_vid_learning_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

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

+3 −5
Original line number Diff line number Diff line
@@ -322,13 +322,11 @@ static int mlxsw_sp_port_learning_set(struct mlxsw_sp_port *mlxsw_sp_port, 
	if (mlxsw_sp_port_is_vport(mlxsw_sp_port)) {

		vid = mlxsw_sp_vport_vid_get(mlxsw_sp_port);



		return __mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid, vid,

							set);

		return mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid, set);

	}



	for_each_set_bit(vid, mlxsw_sp_port->active_vlans, VLAN_N_VID) {

		err = __mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid, vid,

						       set);

		err = mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid, set);

		if (err)

			goto err_port_vid_learning_set;

	}
@@ -337,7 +335,7 @@ static int mlxsw_sp_port_learning_set(struct mlxsw_sp_port *mlxsw_sp_port, 


err_port_vid_learning_set:

	for_each_set_bit(vid, mlxsw_sp_port->active_vlans, VLAN_N_VID)

		__mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid, vid, !set);

		mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid, !set);

	return err;

}