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

mlxsw: spectrum: Remove unused RIF and FID families 



In merge commit 50853808 ("Merge branch
'mlxsw-Prepare-for-VLAN-aware-bridge-w-VxLAN'") I flipped mlxsw to use
emulated 802.1Q FIDs and correspondingly emulated VLAN RIFs. This means
that the non-emulated variants are no longer used. Remove them and
suppress the following warnings when compiling with W=1:

drivers/net/ethernet/mellanox/mlxsw//spectrum_router.c:7572:38: warning:
‘mlxsw_sp_rif_vlan_ops’ defined but not used [-Wunused-const-variable=]

drivers/net/ethernet/mellanox/mlxsw//spectrum_fid.c:584:41: warning:
‘mlxsw_sp_fid_8021q_family’ defined but not used
[-Wunused-const-variable=]

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

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

+8 −144
Original line number Diff line number Diff line
@@ -438,16 +438,6 @@ static int mlxsw_sp_fid_vni_op(struct mlxsw_sp *mlxsw_sp, u16 fid_index, 
	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfmr), sfmr_pl);

}



static int mlxsw_sp_fid_vid_map(struct mlxsw_sp *mlxsw_sp, u16 fid_index,

				u16 vid, bool valid)

{

	enum mlxsw_reg_svfa_mt mt = MLXSW_REG_SVFA_MT_VID_TO_FID;

	char svfa_pl[MLXSW_REG_SVFA_LEN];



	mlxsw_reg_svfa_pack(svfa_pl, 0, mt, valid, fid_index, vid);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(svfa), svfa_pl);

}



static int __mlxsw_sp_fid_port_vid_map(struct mlxsw_sp *mlxsw_sp, u16 fid_index,

				       u8 local_port, u16 vid, bool valid)

{
@@ -458,140 +448,6 @@ static int __mlxsw_sp_fid_port_vid_map(struct mlxsw_sp *mlxsw_sp, u16 fid_index, 
	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(svfa), svfa_pl);

}



static int mlxsw_sp_fid_8021q_configure(struct mlxsw_sp_fid *fid)

{

	struct mlxsw_sp *mlxsw_sp = fid->fid_family->mlxsw_sp;

	struct mlxsw_sp_fid_8021q *fid_8021q;

	int err;



	err = mlxsw_sp_fid_op(mlxsw_sp, fid->fid_index, fid->fid_index, true);

	if (err)

		return err;



	fid_8021q = mlxsw_sp_fid_8021q_fid(fid);

	err = mlxsw_sp_fid_vid_map(mlxsw_sp, fid->fid_index, fid_8021q->vid,

				   true);

	if (err)

		goto err_fid_map;



	return 0;



err_fid_map:

	mlxsw_sp_fid_op(mlxsw_sp, fid->fid_index, 0, false);

	return err;

}



static void mlxsw_sp_fid_8021q_deconfigure(struct mlxsw_sp_fid *fid)

{

	struct mlxsw_sp *mlxsw_sp = fid->fid_family->mlxsw_sp;

	struct mlxsw_sp_fid_8021q *fid_8021q;



	fid_8021q = mlxsw_sp_fid_8021q_fid(fid);

	mlxsw_sp_fid_vid_map(mlxsw_sp, fid->fid_index, fid_8021q->vid, false);

	mlxsw_sp_fid_op(mlxsw_sp, fid->fid_index, 0, false);

}



static int mlxsw_sp_fid_8021q_index_alloc(struct mlxsw_sp_fid *fid,

					  const void *arg, u16 *p_fid_index)

{

	struct mlxsw_sp_fid_family *fid_family = fid->fid_family;

	u16 vid = *(u16 *) arg;



	/* Use 1:1 mapping for simplicity although not a must */

	if (vid < fid_family->start_index || vid > fid_family->end_index)

		return -EINVAL;

	*p_fid_index = vid;



	return 0;

}



static bool

mlxsw_sp_fid_8021q_compare(const struct mlxsw_sp_fid *fid, const void *arg)

{

	u16 vid = *(u16 *) arg;



	return mlxsw_sp_fid_8021q_fid(fid)->vid == vid;

}



static u16 mlxsw_sp_fid_8021q_flood_index(const struct mlxsw_sp_fid *fid)

{

	return fid->fid_index;

}



static int mlxsw_sp_fid_8021q_port_vid_map(struct mlxsw_sp_fid *fid,

					   struct mlxsw_sp_port *mlxsw_sp_port,

					   u16 vid)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	u8 local_port = mlxsw_sp_port->local_port;



	/* In case there are no {Port, VID} => FID mappings on the port,

	 * we can use the global VID => FID mapping we created when the

	 * FID was configured.

	 */

	if (mlxsw_sp->fid_core->port_fid_mappings[local_port] == 0)

		return 0;

	return __mlxsw_sp_fid_port_vid_map(mlxsw_sp, fid->fid_index, local_port,

					   vid, true);

}



static void

mlxsw_sp_fid_8021q_port_vid_unmap(struct mlxsw_sp_fid *fid,

				  struct mlxsw_sp_port *mlxsw_sp_port, u16 vid)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	u8 local_port = mlxsw_sp_port->local_port;



	if (mlxsw_sp->fid_core->port_fid_mappings[local_port] == 0)

		return;

	__mlxsw_sp_fid_port_vid_map(mlxsw_sp, fid->fid_index, local_port, vid,

				    false);

}



static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021q_ops = {

	.setup			= mlxsw_sp_fid_8021q_setup,

	.configure		= mlxsw_sp_fid_8021q_configure,

	.deconfigure		= mlxsw_sp_fid_8021q_deconfigure,

	.index_alloc		= mlxsw_sp_fid_8021q_index_alloc,

	.compare		= mlxsw_sp_fid_8021q_compare,

	.flood_index		= mlxsw_sp_fid_8021q_flood_index,

	.port_vid_map		= mlxsw_sp_fid_8021q_port_vid_map,

	.port_vid_unmap		= mlxsw_sp_fid_8021q_port_vid_unmap,

};



static const struct mlxsw_sp_flood_table mlxsw_sp_fid_8021q_flood_tables[] = {

	{

		.packet_type	= MLXSW_SP_FLOOD_TYPE_UC,

		.bridge_type	= MLXSW_REG_SFGC_BRIDGE_TYPE_1Q_FID,

		.table_type	= MLXSW_REG_SFGC_TABLE_TYPE_FID_OFFSET,

		.table_index	= 0,

	},

	{

		.packet_type	= MLXSW_SP_FLOOD_TYPE_MC,

		.bridge_type	= MLXSW_REG_SFGC_BRIDGE_TYPE_1Q_FID,

		.table_type	= MLXSW_REG_SFGC_TABLE_TYPE_FID_OFFSET,

		.table_index	= 1,

	},

	{

		.packet_type	= MLXSW_SP_FLOOD_TYPE_BC,

		.bridge_type	= MLXSW_REG_SFGC_BRIDGE_TYPE_1Q_FID,

		.table_type	= MLXSW_REG_SFGC_TABLE_TYPE_FID_OFFSET,

		.table_index	= 2,

	},

};



/* Range and flood configuration must match mlxsw_config_profile */

static const struct mlxsw_sp_fid_family mlxsw_sp_fid_8021q_family = {

	.type			= MLXSW_SP_FID_TYPE_8021Q,

	.fid_size		= sizeof(struct mlxsw_sp_fid_8021q),

	.start_index		= 1,

	.end_index		= VLAN_VID_MASK,

	.flood_tables		= mlxsw_sp_fid_8021q_flood_tables,

	.nr_flood_tables	= ARRAY_SIZE(mlxsw_sp_fid_8021q_flood_tables),

	.rif_type		= MLXSW_SP_RIF_TYPE_VLAN,

	.ops			= &mlxsw_sp_fid_8021q_ops,

};



static struct mlxsw_sp_fid_8021d *

mlxsw_sp_fid_8021d_fid(const struct mlxsw_sp_fid *fid)

{
@@ -846,6 +702,14 @@ static const struct mlxsw_sp_fid_family mlxsw_sp_fid_8021d_family = { 
	.lag_vid_valid		= 1,

};



static bool

mlxsw_sp_fid_8021q_compare(const struct mlxsw_sp_fid *fid, const void *arg)

{

	u16 vid = *(u16 *) arg;



	return mlxsw_sp_fid_8021q_fid(fid)->vid == vid;

}



static void

mlxsw_sp_fid_8021q_fdb_clear_offload(const struct mlxsw_sp_fid *fid,

				     const struct net_device *nve_dev)

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

+39 −104
Original line number Diff line number Diff line
@@ -7475,13 +7475,14 @@ u8 mlxsw_sp_router_port(const struct mlxsw_sp *mlxsw_sp) 
	return mlxsw_core_max_ports(mlxsw_sp->core) + 1;

}



static int mlxsw_sp_rif_vlan_configure(struct mlxsw_sp_rif *rif)

static int mlxsw_sp_rif_fid_configure(struct mlxsw_sp_rif *rif)

{

	struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;

	u16 vid = mlxsw_sp_fid_8021q_vid(rif->fid);

	u16 fid_index = mlxsw_sp_fid_index(rif->fid);

	int err;



	err = mlxsw_sp_rif_vlan_fid_op(rif, MLXSW_REG_RITR_VLAN_IF, vid, true);

	err = mlxsw_sp_rif_vlan_fid_op(rif, MLXSW_REG_RITR_FID_IF, fid_index,

				       true);

	if (err)

		return err;
@@ -7510,13 +7511,13 @@ err_fid_bc_flood_set: 
	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

err_fid_mc_flood_set:

	mlxsw_sp_rif_vlan_fid_op(rif, MLXSW_REG_RITR_VLAN_IF, vid, false);

	mlxsw_sp_rif_vlan_fid_op(rif, MLXSW_REG_RITR_FID_IF, fid_index, false);

	return err;

}



static void mlxsw_sp_rif_vlan_deconfigure(struct mlxsw_sp_rif *rif)

static void mlxsw_sp_rif_fid_deconfigure(struct mlxsw_sp_rif *rif)

{

	u16 vid = mlxsw_sp_fid_8021q_vid(rif->fid);

	u16 fid_index = mlxsw_sp_fid_index(rif->fid);

	struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;

	struct mlxsw_sp_fid *fid = rif->fid;
@@ -7528,9 +7529,40 @@ static void mlxsw_sp_rif_vlan_deconfigure(struct mlxsw_sp_rif *rif) 
			       mlxsw_sp_router_port(mlxsw_sp), false);

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

	mlxsw_sp_rif_vlan_fid_op(rif, MLXSW_REG_RITR_VLAN_IF, vid, false);

	mlxsw_sp_rif_vlan_fid_op(rif, MLXSW_REG_RITR_FID_IF, fid_index, false);

}



static struct mlxsw_sp_fid *

mlxsw_sp_rif_fid_fid_get(struct mlxsw_sp_rif *rif,

			 struct netlink_ext_ack *extack)

{

	return mlxsw_sp_fid_8021d_get(rif->mlxsw_sp, rif->dev->ifindex);

}



static void mlxsw_sp_rif_fid_fdb_del(struct mlxsw_sp_rif *rif, const char *mac)

{

	struct switchdev_notifier_fdb_info info;

	struct net_device *dev;



	dev = br_fdb_find_port(rif->dev, mac, 0);

	if (!dev)

		return;



	info.addr = mac;

	info.vid = 0;

	call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE, dev, &info.info,

				 NULL);

}



static const struct mlxsw_sp_rif_ops mlxsw_sp_rif_fid_ops = {

	.type			= MLXSW_SP_RIF_TYPE_FID,

	.rif_size		= sizeof(struct mlxsw_sp_rif),

	.configure		= mlxsw_sp_rif_fid_configure,

	.deconfigure		= mlxsw_sp_rif_fid_deconfigure,

	.fid_get		= mlxsw_sp_rif_fid_fid_get,

	.fdb_del		= mlxsw_sp_rif_fid_fdb_del,

};



static struct mlxsw_sp_fid *

mlxsw_sp_rif_vlan_fid_get(struct mlxsw_sp_rif *rif,

			  struct netlink_ext_ack *extack)
@@ -7573,103 +7605,6 @@ static void mlxsw_sp_rif_vlan_fdb_del(struct mlxsw_sp_rif *rif, const char *mac) 
				 NULL);

}



static const struct mlxsw_sp_rif_ops mlxsw_sp_rif_vlan_ops = {

	.type			= MLXSW_SP_RIF_TYPE_VLAN,

	.rif_size		= sizeof(struct mlxsw_sp_rif),

	.configure		= mlxsw_sp_rif_vlan_configure,

	.deconfigure		= mlxsw_sp_rif_vlan_deconfigure,

	.fid_get		= mlxsw_sp_rif_vlan_fid_get,

	.fdb_del		= mlxsw_sp_rif_vlan_fdb_del,

};



static int mlxsw_sp_rif_fid_configure(struct mlxsw_sp_rif *rif)

{

	struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;

	u16 fid_index = mlxsw_sp_fid_index(rif->fid);

	int err;



	err = mlxsw_sp_rif_vlan_fid_op(rif, MLXSW_REG_RITR_FID_IF, fid_index,

				       true);

	if (err)

		return err;



	err = mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

				     mlxsw_sp_router_port(mlxsw_sp), true);

	if (err)

		goto err_fid_mc_flood_set;



	err = mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,

				     mlxsw_sp_router_port(mlxsw_sp), true);

	if (err)

		goto err_fid_bc_flood_set;



	err = mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,

				  mlxsw_sp_fid_index(rif->fid), true);

	if (err)

		goto err_rif_fdb_op;



	mlxsw_sp_fid_rif_set(rif->fid, rif);

	return 0;



err_rif_fdb_op:

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

err_fid_bc_flood_set:

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

err_fid_mc_flood_set:

	mlxsw_sp_rif_vlan_fid_op(rif, MLXSW_REG_RITR_FID_IF, fid_index, false);

	return err;

}



static void mlxsw_sp_rif_fid_deconfigure(struct mlxsw_sp_rif *rif)

{

	u16 fid_index = mlxsw_sp_fid_index(rif->fid);

	struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;

	struct mlxsw_sp_fid *fid = rif->fid;



	mlxsw_sp_fid_rif_set(fid, NULL);

	mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,

			    mlxsw_sp_fid_index(fid), false);

	mlxsw_sp_rif_macvlan_flush(rif);

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

	mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,

			       mlxsw_sp_router_port(mlxsw_sp), false);

	mlxsw_sp_rif_vlan_fid_op(rif, MLXSW_REG_RITR_FID_IF, fid_index, false);

}



static struct mlxsw_sp_fid *

mlxsw_sp_rif_fid_fid_get(struct mlxsw_sp_rif *rif,

			 struct netlink_ext_ack *extack)

{

	return mlxsw_sp_fid_8021d_get(rif->mlxsw_sp, rif->dev->ifindex);

}



static void mlxsw_sp_rif_fid_fdb_del(struct mlxsw_sp_rif *rif, const char *mac)

{

	struct switchdev_notifier_fdb_info info;

	struct net_device *dev;



	dev = br_fdb_find_port(rif->dev, mac, 0);

	if (!dev)

		return;



	info.addr = mac;

	info.vid = 0;

	call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE, dev, &info.info,

				 NULL);

}



static const struct mlxsw_sp_rif_ops mlxsw_sp_rif_fid_ops = {

	.type			= MLXSW_SP_RIF_TYPE_FID,

	.rif_size		= sizeof(struct mlxsw_sp_rif),

	.configure		= mlxsw_sp_rif_fid_configure,

	.deconfigure		= mlxsw_sp_rif_fid_deconfigure,

	.fid_get		= mlxsw_sp_rif_fid_fid_get,

	.fdb_del		= mlxsw_sp_rif_fid_fdb_del,

};



static const struct mlxsw_sp_rif_ops mlxsw_sp_rif_vlan_emu_ops = {

	.type			= MLXSW_SP_RIF_TYPE_VLAN,

	.rif_size		= sizeof(struct mlxsw_sp_rif),

CRA Git | Maintained and supported by SUSTech CRA and CCSE