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

Commit bdc17fad authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-vlan' 



Jiri Pirko says:

====================
mlxsw: small driver update

Couple of VLAN-related patches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f99bf205 b07a966c

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

+84 −45
Original line number Diff line number Diff line
@@ -342,14 +342,35 @@ static int mlxsw_sp_port_add_vids(struct net_device *dev, u16 vid_begin, 
	return err;

}



static int __mlxsw_sp_port_vlans_set(struct mlxsw_sp_port *mlxsw_sp_port,

				     u16 vid_begin, u16 vid_end, bool is_member,

				     bool untagged)

{

	u16 vid, vid_e;

	int err;



	for (vid = vid_begin; vid <= vid_end;

	     vid += MLXSW_REG_SPVM_REC_MAX_COUNT) {

		vid_e = min((u16) (vid + MLXSW_REG_SPVM_REC_MAX_COUNT - 1),

			    vid_end);



		err = mlxsw_sp_port_vlan_set(mlxsw_sp_port, vid, vid_e,

					     is_member, untagged);

		if (err)

			return err;

	}



	return 0;

}



static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,

				     u16 vid_begin, u16 vid_end,

				     bool flag_untagged, bool flag_pvid)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	struct net_device *dev = mlxsw_sp_port->dev;

	u16 vid, last_visited_vid, old_pvid;

	enum mlxsw_reg_svfa_mt mt;

	u16 vid, vid_e;

	int err;



	/* In case this is invoked with BRIDGE_FLAGS_SELF and port is
@@ -377,15 +398,18 @@ static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port, 
			if (err) {

				netdev_err(dev, "Failed to create FID=VID=%d mapping\n",

					   vid);

				return err;

				goto err_port_vid_to_fid_set;

			}

		}

	}



	/* Set FID mapping according to port's mode */

	for (vid = vid_begin; vid <= vid_end; vid++) {

		err = mlxsw_sp_port_fid_map(mlxsw_sp_port, vid);

		if (err) {

			netdev_err(dev, "Failed to map FID=%d", vid);

			return err;

			last_visited_vid = --vid;

			goto err_port_fid_map;

		}

	}
@@ -393,40 +417,62 @@ static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port, 
					true, false);

	if (err) {

		netdev_err(dev, "Failed to configure flooding\n");

		return err;

		goto err_port_flood_set;

	}



	for (vid = vid_begin; vid <= vid_end;

	     vid += MLXSW_REG_SPVM_REC_MAX_COUNT) {

		vid_e = min((u16) (vid + MLXSW_REG_SPVM_REC_MAX_COUNT - 1),

			    vid_end);



		err = mlxsw_sp_port_vlan_set(mlxsw_sp_port, vid, vid_e, true,

					     flag_untagged);

	err = __mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end,

					true, flag_untagged);

	if (err) {

			netdev_err(mlxsw_sp_port->dev, "Unable to add VIDs %d-%d\n",

				   vid, vid_e);

			return err;

		}

		netdev_err(dev, "Unable to add VIDs %d-%d\n", vid_begin,

			   vid_end);

		goto err_port_vlans_set;

	}



	vid = vid_begin;

	if (flag_pvid && mlxsw_sp_port->pvid != vid) {

		err = mlxsw_sp_port_pvid_set(mlxsw_sp_port, vid);

	old_pvid = mlxsw_sp_port->pvid;

	if (flag_pvid && old_pvid != vid_begin) {

		err = mlxsw_sp_port_pvid_set(mlxsw_sp_port, vid_begin);

		if (err) {

			netdev_err(mlxsw_sp_port->dev, "Unable to add PVID %d\n",

				   vid);

			return err;

			netdev_err(dev, "Unable to add PVID %d\n", vid_begin);

			goto err_port_pvid_set;

		}

		mlxsw_sp_port->pvid = vid;

		mlxsw_sp_port->pvid = vid_begin;

	}



	/* Changing activity bits only if HW operation succeded */

	for (vid = vid_begin; vid <= vid_end; vid++)

		set_bit(vid, mlxsw_sp_port->active_vlans);



	return mlxsw_sp_port_stp_state_set(mlxsw_sp_port,

	/* STP state change must be done after we set active VLANs */

	err = mlxsw_sp_port_stp_state_set(mlxsw_sp_port,

					  mlxsw_sp_port->stp_state);

	if (err) {

		netdev_err(dev, "Failed to set STP state\n");

		goto err_port_stp_state_set;

	}



	return 0;



err_port_vid_to_fid_set:

	mlxsw_sp_fid_destroy(mlxsw_sp, vid);

	return err;



err_port_stp_state_set:

	for (vid = vid_begin; vid <= vid_end; vid++)

		clear_bit(vid, mlxsw_sp_port->active_vlans);

	if (old_pvid != mlxsw_sp_port->pvid)

		mlxsw_sp_port_pvid_set(mlxsw_sp_port, old_pvid);

err_port_pvid_set:

	__mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end, false,

				  false);

err_port_vlans_set:

	__mlxsw_sp_port_flood_set(mlxsw_sp_port, vid_begin, vid_end, false,

				  false);

err_port_flood_set:

	last_visited_vid = vid_end;

err_port_fid_map:

	for (vid = last_visited_vid; vid >= vid_begin; vid--)

		mlxsw_sp_port_fid_unmap(mlxsw_sp_port, vid);

	return err;

}



static int mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,
@@ -532,7 +578,7 @@ static int __mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port, 
				     u16 vid_begin, u16 vid_end, bool init)

{

	struct net_device *dev = mlxsw_sp_port->dev;

	u16 vid, vid_e;

	u16 vid, pvid;

	int err;



	/* In case this is invoked with BRIDGE_FLAGS_SELF and port is
@@ -542,30 +588,23 @@ static int __mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port, 
	if (!init && !mlxsw_sp_port->bridged)

		return mlxsw_sp_port_kill_vids(dev, vid_begin, vid_end);



	for (vid = vid_begin; vid <= vid_end;

	     vid += MLXSW_REG_SPVM_REC_MAX_COUNT) {

		vid_e = min((u16) (vid + MLXSW_REG_SPVM_REC_MAX_COUNT - 1),

			    vid_end);

		err = mlxsw_sp_port_vlan_set(mlxsw_sp_port, vid, vid_e, false,

					     false);

	err = __mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end,

					false, false);

	if (err) {

			netdev_err(mlxsw_sp_port->dev, "Unable to del VIDs %d-%d\n",

				   vid, vid_e);

		netdev_err(dev, "Unable to del VIDs %d-%d\n", vid_begin,

			   vid_end);

		return err;

	}

	}



	if ((mlxsw_sp_port->pvid >= vid_begin) &&

	    (mlxsw_sp_port->pvid <= vid_end)) {

	pvid = mlxsw_sp_port->pvid;

	if (pvid >= vid_begin && pvid <= vid_end && pvid != 1) {

		/* Default VLAN is always 1 */

		mlxsw_sp_port->pvid = 1;

		err = mlxsw_sp_port_pvid_set(mlxsw_sp_port,

					     mlxsw_sp_port->pvid);

		err = mlxsw_sp_port_pvid_set(mlxsw_sp_port, 1);

		if (err) {

			netdev_err(mlxsw_sp_port->dev, "Unable to del PVID %d\n",

				   vid);

			netdev_err(dev, "Unable to del PVID %d\n", pvid);

			return err;

		}

		mlxsw_sp_port->pvid = 1;

	}



	if (init)