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

mlxsw: spectrum_router: Implement common RIF core 



The mlxsw driver currently implements three types of RIFs. VLAN and FID
RIFs for L3 interfaces on top of VLAN-aware and VLAN-unaware bridges
(respectively) and Subport RIFs for all other L3 interfaces.

All the RIF types follow a common configuration procedure, which only
differs in the type-specific bits. The patch exploits this fact and
consolidates the common code paths, thereby simplifying the code and
making it more extensible.

This work also prepares the driver for use with future ASICs, where the
range of the Subport RIFs will be extended and their configuration
modified accordingly. By merely implementing a new RIF operations and
selecting it during initialization, the same driver could be re-used.

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 a1107487

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

+5 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ int mlxsw_sp_netdevice_vrf_event(struct net_device *l3_dev, unsigned long event, 
				 struct netdev_notifier_changeupper_info *info);

void

mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);

void mlxsw_sp_rif_destroy(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_rif *rif);

void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif);



int mlxsw_sp_kvdl_alloc(struct mlxsw_sp *mlxsw_sp, unsigned int entry_count,

			u32 *p_entry_index);
@@ -519,6 +519,10 @@ enum mlxsw_sp_rif_type mlxsw_sp_fid_rif_type(const struct mlxsw_sp_fid *fid); 
u16 mlxsw_sp_fid_index(const struct mlxsw_sp_fid *fid);

enum mlxsw_sp_fid_type mlxsw_sp_fid_type(const struct mlxsw_sp_fid *fid);

void mlxsw_sp_fid_rif_set(struct mlxsw_sp_fid *fid, struct mlxsw_sp_rif *rif);

enum mlxsw_sp_rif_type

mlxsw_sp_fid_type_rif_type(const struct mlxsw_sp *mlxsw_sp,

			   enum mlxsw_sp_fid_type type);

u16 mlxsw_sp_fid_8021q_vid(const struct mlxsw_sp_fid *fid);

struct mlxsw_sp_fid *mlxsw_sp_fid_8021q_get(struct mlxsw_sp *mlxsw_sp, u16 vid);

struct mlxsw_sp_fid *mlxsw_sp_fid_8021d_get(struct mlxsw_sp *mlxsw_sp,

					    int br_ifindex);

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

+15 −1
Original line number Diff line number Diff line
@@ -205,12 +205,26 @@ void mlxsw_sp_fid_rif_set(struct mlxsw_sp_fid *fid, struct mlxsw_sp_rif *rif) 
	fid->rif = rif;

}



enum mlxsw_sp_rif_type

mlxsw_sp_fid_type_rif_type(const struct mlxsw_sp *mlxsw_sp,

			   enum mlxsw_sp_fid_type type)

{

	struct mlxsw_sp_fid_core *fid_core = mlxsw_sp->fid_core;



	return fid_core->fid_family_arr[type]->rif_type;

}



static struct mlxsw_sp_fid_8021q *

mlxsw_sp_fid_8021q_fid(const struct mlxsw_sp_fid *fid)

{

	return container_of(fid, struct mlxsw_sp_fid_8021q, common);

}



u16 mlxsw_sp_fid_8021q_vid(const struct mlxsw_sp_fid *fid)

{

	return mlxsw_sp_fid_8021q_fid(fid)->vid;

}



static void mlxsw_sp_fid_8021q_setup(struct mlxsw_sp_fid *fid, const void *arg)

{

	u16 vid = *(u16 *) arg;
@@ -780,7 +794,7 @@ void mlxsw_sp_fid_put(struct mlxsw_sp_fid *fid) 
		/* Destroy the associated RIF and let it drop the last

		 * reference on the FID.

		 */

		return mlxsw_sp_rif_destroy(fid_family->mlxsw_sp, fid->rif);

		return mlxsw_sp_rif_destroy(fid->rif);

	} else if (fid->ref_count == 0) {

		list_del(&fid->list);

		fid->fid_family->ops->deconfigure(fid);

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

+317 −235

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE