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

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

mlxsw: spectrum: Move PVID code to appropriate place 



PVID is a port attribute and should therefore reside in the main driver
file and not the switchdev specific one.

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 7cbc4277

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

+45 −0
Original line number Diff line number Diff line
@@ -683,6 +683,51 @@ int mlxsw_sp_port_vid_learning_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid, 
	return err;

}



static int __mlxsw_sp_port_pvid_set(struct mlxsw_sp_port *mlxsw_sp_port,

				    u16 vid)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char spvid_pl[MLXSW_REG_SPVID_LEN];



	mlxsw_reg_spvid_pack(spvid_pl, mlxsw_sp_port->local_port, vid);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(spvid), spvid_pl);

}



static int mlxsw_sp_port_allow_untagged_set(struct mlxsw_sp_port *mlxsw_sp_port,

					    bool allow)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char spaft_pl[MLXSW_REG_SPAFT_LEN];



	mlxsw_reg_spaft_pack(spaft_pl, mlxsw_sp_port->local_port, allow);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(spaft), spaft_pl);

}



int mlxsw_sp_port_pvid_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid)

{

	int err;



	if (!vid) {

		err = mlxsw_sp_port_allow_untagged_set(mlxsw_sp_port, false);

		if (err)

			return err;

	} else {

		err = __mlxsw_sp_port_pvid_set(mlxsw_sp_port, vid);

		if (err)

			return err;

		err = mlxsw_sp_port_allow_untagged_set(mlxsw_sp_port, true);

		if (err)

			goto err_port_allow_untagged_set;

	}



	mlxsw_sp_port->pvid = vid;

	return 0;



err_port_allow_untagged_set:

	__mlxsw_sp_port_pvid_set(mlxsw_sp_port, mlxsw_sp_port->pvid);

	return err;

}



static int

mlxsw_sp_port_system_port_mapping_set(struct mlxsw_sp_port *mlxsw_sp_port)

{

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

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,6 @@ int mlxsw_sp_port_vlan_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid_begin, 
int mlxsw_sp_vport_flood_set(struct mlxsw_sp_port *mlxsw_sp_vport, u16 fid,

			     bool set);

void mlxsw_sp_port_active_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port);

int mlxsw_sp_port_pvid_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid);

int mlxsw_sp_port_fdb_flush(struct mlxsw_sp_port *mlxsw_sp_port, u16 fid);

int mlxsw_sp_rif_fdb_op(struct mlxsw_sp *mlxsw_sp, const char *mac, u16 fid,

			bool adding);
@@ -446,6 +445,7 @@ 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,

				   bool learn_enable);

int mlxsw_sp_port_pvid_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid);



#ifdef CONFIG_MLXSW_SPECTRUM_DCB

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

+0 −57
Original line number Diff line number Diff line
@@ -663,63 +663,6 @@ static void mlxsw_sp_port_fid_leave(struct mlxsw_sp_port *mlxsw_sp_port, 
	__mlxsw_sp_port_fid_leave(mlxsw_sp_port, fid);

}



static int __mlxsw_sp_port_pvid_set(struct mlxsw_sp_port *mlxsw_sp_port,

				    u16 vid)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char spvid_pl[MLXSW_REG_SPVID_LEN];



	mlxsw_reg_spvid_pack(spvid_pl, mlxsw_sp_port->local_port, vid);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(spvid), spvid_pl);

}



static int mlxsw_sp_port_allow_untagged_set(struct mlxsw_sp_port *mlxsw_sp_port,

					    bool allow)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char spaft_pl[MLXSW_REG_SPAFT_LEN];



	mlxsw_reg_spaft_pack(spaft_pl, mlxsw_sp_port->local_port, allow);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(spaft), spaft_pl);

}



int mlxsw_sp_port_pvid_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid)

{

	struct net_device *dev = mlxsw_sp_port->dev;

	int err;



	if (!vid) {

		err = mlxsw_sp_port_allow_untagged_set(mlxsw_sp_port, false);

		if (err) {

			netdev_err(dev, "Failed to disallow untagged traffic\n");

			return err;

		}

	} else {

		err = __mlxsw_sp_port_pvid_set(mlxsw_sp_port, vid);

		if (err) {

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

			return err;

		}



		/* Only allow if not already allowed. */

		if (!mlxsw_sp_port->pvid) {

			err = mlxsw_sp_port_allow_untagged_set(mlxsw_sp_port,

							       true);

			if (err) {

				netdev_err(dev, "Failed to allow untagged traffic\n");

				goto err_port_allow_untagged_set;

			}

		}

	}



	mlxsw_sp_port->pvid = vid;

	return 0;



err_port_allow_untagged_set:

	__mlxsw_sp_port_pvid_set(mlxsw_sp_port, mlxsw_sp_port->pvid);

	return err;

}



static u16

mlxsw_sp_port_pvid_determine(const struct mlxsw_sp_port *mlxsw_sp_port,

			     u16 vid, bool is_pvid)