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

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

mlxsw: spectrum: Replace hard-coded default VID with a define 



Subsequent patches are going to replace the current default VID (1) with
VLAN_N_VID - 1 (4095).

Prepare for this conversion by replacing the hard-coded '1' with a
define.

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 9d15dceb

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

+8 −6
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ struct mlxsw_sp_port_vlan * 
mlxsw_sp_port_vlan_create(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid)

{

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;

	bool untagged = vid == 1;

	bool untagged = vid == MLXSW_SP_DEFAULT_VID;

	int err;



	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);
@@ -3042,7 +3042,7 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	mlxsw_sp_port->dev = dev;

	mlxsw_sp_port->mlxsw_sp = mlxsw_sp;

	mlxsw_sp_port->local_port = local_port;

	mlxsw_sp_port->pvid = 1;

	mlxsw_sp_port->pvid = MLXSW_SP_DEFAULT_VID;

	mlxsw_sp_port->split = split;

	mlxsw_sp_port->mapping.module = module;

	mlxsw_sp_port->mapping.width = width;
@@ -3181,7 +3181,8 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
		goto err_port_nve_init;

	}



	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_create(mlxsw_sp_port, 1);

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_create(mlxsw_sp_port,

						       MLXSW_SP_DEFAULT_VID);

	if (IS_ERR(mlxsw_sp_port_vlan)) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to create VID 1\n",

			mlxsw_sp_port->local_port);
@@ -4651,6 +4652,7 @@ static int mlxsw_sp_port_lag_join(struct mlxsw_sp_port *mlxsw_sp_port, 
{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;

	u16 vid = MLXSW_SP_DEFAULT_VID;

	struct mlxsw_sp_upper *lag;

	u16 lag_id;

	u8 port_index;
@@ -4684,7 +4686,7 @@ static int mlxsw_sp_port_lag_join(struct mlxsw_sp_port *mlxsw_sp_port, 
	lag->ref_count++;



	/* Port is no longer usable as a router interface */

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, 1);

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);

	if (mlxsw_sp_port_vlan->fid)

		mlxsw_sp_port_vlan_router_leave(mlxsw_sp_port_vlan);
@@ -4728,9 +4730,9 @@ static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port, 
	mlxsw_sp_port->lagged = 0;

	lag->ref_count--;



	mlxsw_sp_port_vlan_create(mlxsw_sp_port, 1);

	mlxsw_sp_port_vlan_create(mlxsw_sp_port, MLXSW_SP_DEFAULT_VID);

	/* Make sure untagged frames are allowed to ingress */

	mlxsw_sp_port_pvid_set(mlxsw_sp_port, 1);

	mlxsw_sp_port_pvid_set(mlxsw_sp_port, MLXSW_SP_DEFAULT_VID);

}



static int mlxsw_sp_lag_dist_port_add(struct mlxsw_sp_port *mlxsw_sp_port,

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include "core_acl_flex_actions.h"

#include "reg.h"



#define MLXSW_SP_DEFAULT_VID 1



#define MLXSW_SP_FID_8021D_MAX 1024



#define MLXSW_SP_MID_MAX 7000

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

+4 −4
Original line number Diff line number Diff line
@@ -6535,8 +6535,8 @@ static int mlxsw_sp_inetaddr_port_event(struct net_device *port_dev, 
	    netif_is_ovs_port(port_dev))

		return 0;



	return mlxsw_sp_inetaddr_port_vlan_event(port_dev, port_dev, event, 1,

						 extack);

	return mlxsw_sp_inetaddr_port_vlan_event(port_dev, port_dev, event,

						 MLXSW_SP_DEFAULT_VID, extack);

}



static int __mlxsw_sp_inetaddr_lag_event(struct net_device *l3_dev,
@@ -6569,8 +6569,8 @@ static int mlxsw_sp_inetaddr_lag_event(struct net_device *lag_dev, 
	if (netif_is_bridge_port(lag_dev))

		return 0;



	return __mlxsw_sp_inetaddr_lag_event(lag_dev, lag_dev, event, 1,

					     extack);

	return __mlxsw_sp_inetaddr_lag_event(lag_dev, lag_dev, event,

					     MLXSW_SP_DEFAULT_VID, extack);

}



static int mlxsw_sp_inetaddr_bridge_event(struct mlxsw_sp *mlxsw_sp,

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

+6 −5
Original line number Diff line number Diff line
@@ -1975,13 +1975,14 @@ mlxsw_sp_bridge_8021q_port_join(struct mlxsw_sp_bridge_device *bridge_device, 
				struct netlink_ext_ack *extack)

{

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;

	u16 vid = MLXSW_SP_DEFAULT_VID;



	if (is_vlan_dev(bridge_port->dev)) {

		NL_SET_ERR_MSG_MOD(extack, "Can not enslave a VLAN device to a VLAN-aware bridge");

		return -EINVAL;

	}



	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, 1);

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);

	if (WARN_ON(!mlxsw_sp_port_vlan))

		return -EINVAL;
@@ -1996,9 +1997,9 @@ mlxsw_sp_bridge_8021q_port_leave(struct mlxsw_sp_bridge_device *bridge_device, 
				 struct mlxsw_sp_bridge_port *bridge_port,

				 struct mlxsw_sp_port *mlxsw_sp_port)

{

	mlxsw_sp_port_vlan_create(mlxsw_sp_port, 1);

	mlxsw_sp_port_vlan_create(mlxsw_sp_port, MLXSW_SP_DEFAULT_VID);

	/* Make sure untagged frames are allowed to ingress */

	mlxsw_sp_port_pvid_set(mlxsw_sp_port, 1);

	mlxsw_sp_port_pvid_set(mlxsw_sp_port, MLXSW_SP_DEFAULT_VID);

}



static int
@@ -2169,7 +2170,7 @@ mlxsw_sp_bridge_8021d_port_join(struct mlxsw_sp_bridge_device *bridge_device, 
	struct net_device *dev = bridge_port->dev;

	u16 vid;



	vid = is_vlan_dev(dev) ? vlan_dev_vlan_id(dev) : 1;

	vid = is_vlan_dev(dev) ? vlan_dev_vlan_id(dev) : MLXSW_SP_DEFAULT_VID;

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);

	if (WARN_ON(!mlxsw_sp_port_vlan))

		return -EINVAL;
@@ -2196,7 +2197,7 @@ mlxsw_sp_bridge_8021d_port_leave(struct mlxsw_sp_bridge_device *bridge_device, 
	struct net_device *dev = bridge_port->dev;

	u16 vid;



	vid = is_vlan_dev(dev) ? vlan_dev_vlan_id(dev) : 1;

	vid = is_vlan_dev(dev) ? vlan_dev_vlan_id(dev) : MLXSW_SP_DEFAULT_VID;

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);

	if (!mlxsw_sp_port_vlan)

		return;