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

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

mlxsw: spectrum: Implement common FID core 



The device supports three types of FIDs. 802.1Q and 802.1D FIDs for
VLAN-aware and VLAN-unaware bridges (respectively) and rFIDs to
transport packets to the router block.

The different users (e.g., bridge, router, ACLs) of the FIDs
infrastructure need not know about the internal FIDs implementation and
can therefore interact with it using a restricted set of exported
functions.

By encapsulating the entire FID logic and hiding it from the rest of the
driver we get a code base that it much simpler and easier to work with
and extend.

For example, in the current Spectrum ASIC only 802.1D FIDs can be
assigned a VNI, but future ASICs will also support 802.1Q FIDs. With
this patch in place, support for future ASICs can be easily added by
implementing a new FID operations according to their capabilities.

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 c9ec53f0

drivers/net/ethernet/mellanox/mlxsw/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ mlxsw_spectrum-objs := spectrum.o spectrum_buffers.o \ 
				   spectrum_switchdev.o spectrum_router.o \

				   spectrum_kvdl.o spectrum_acl_tcam.o \

				   spectrum_acl.o spectrum_flower.o \

				   spectrum_cnt.o spectrum_dpipe.o

				   spectrum_cnt.o spectrum_dpipe.o \

				   spectrum_fid.o

mlxsw_spectrum-$(CONFIG_MLXSW_SPECTRUM_DCB)	+= spectrum_dcb.o

obj-$(CONFIG_MLXSW_MINIMAL)	+= mlxsw_minimal.o

mlxsw_minimal-objs		:= minimal.o

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

+21 −171
Original line number Diff line number Diff line
@@ -870,8 +870,7 @@ static int mlxsw_sp_port_swid_set(struct mlxsw_sp_port *mlxsw_sp_port, u8 swid) 
					swid);

}



static int mlxsw_sp_port_vp_mode_set(struct mlxsw_sp_port *mlxsw_sp_port,

				     bool enable)

int mlxsw_sp_port_vp_mode_set(struct mlxsw_sp_port *mlxsw_sp_port, bool enable)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char svpe_pl[MLXSW_REG_SVPE_LEN];
@@ -880,18 +879,6 @@ static int mlxsw_sp_port_vp_mode_set(struct mlxsw_sp_port *mlxsw_sp_port, 
	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(svpe), svpe_pl);

}



int mlxsw_sp_port_vid_to_fid_set(struct mlxsw_sp_port *mlxsw_sp_port,

				 enum mlxsw_reg_svfa_mt mt, bool valid, u16 fid,

				 u16 vid)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char svfa_pl[MLXSW_REG_SVFA_LEN];



	mlxsw_reg_svfa_pack(svfa_pl, mlxsw_sp_port->local_port, mt, valid,

			    fid, vid);

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

}



int mlxsw_sp_port_vid_learning_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

				   bool learn_enable)

{
@@ -1398,75 +1385,6 @@ int mlxsw_sp_port_vlan_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid_begin, 
	return 0;

}



int mlxsw_sp_port_vp_mode_trans(struct mlxsw_sp_port *mlxsw_sp_port)

{

	enum mlxsw_reg_svfa_mt mt = MLXSW_REG_SVFA_MT_PORT_VID_TO_FID;

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;

	struct mlxsw_sp_fid *fid;

	u16 vid;

	int err;



	list_for_each_entry(mlxsw_sp_port_vlan, &mlxsw_sp_port->vlans_list,

			    list) {

		fid = mlxsw_sp_port_vlan->fid;



		if (!fid || fid->fid >= MLXSW_SP_VFID_BASE)

			continue;



		vid = mlxsw_sp_port_vlan->vid;

		err = mlxsw_sp_port_vid_to_fid_set(mlxsw_sp_port, mt, true,

						   fid->fid, vid);

		if (err)

			goto err_port_vid_to_fid_set;

	}



	err = mlxsw_sp_port_vp_mode_set(mlxsw_sp_port, true);

	if (err)

		goto err_port_vp_mode_set;



	return 0;



err_port_vp_mode_set:

err_port_vid_to_fid_set:

	list_for_each_entry_continue_reverse(mlxsw_sp_port_vlan,

					     &mlxsw_sp_port->vlans_list, list) {

		fid = mlxsw_sp_port_vlan->fid;



		if (!fid || fid->fid >= MLXSW_SP_VFID_BASE)

			continue;



		vid = mlxsw_sp_port_vlan->vid;

		mlxsw_sp_port_vid_to_fid_set(mlxsw_sp_port, mt, false, fid->fid,

					     vid);

	}

	return err;

}



int mlxsw_sp_port_vlan_mode_trans(struct mlxsw_sp_port *mlxsw_sp_port)

{

	enum mlxsw_reg_svfa_mt mt = MLXSW_REG_SVFA_MT_PORT_VID_TO_FID;

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;

	int err;



	err = mlxsw_sp_port_vp_mode_set(mlxsw_sp_port, false);

	if (err)

		return err;



	list_for_each_entry_reverse(mlxsw_sp_port_vlan,

				    &mlxsw_sp_port->vlans_list, list) {

		struct mlxsw_sp_fid *fid = mlxsw_sp_port_vlan->fid;

		u16 vid = mlxsw_sp_port_vlan->vid;



		if (!fid || fid->fid >= MLXSW_SP_VFID_BASE)

			continue;



		mlxsw_sp_port_vid_to_fid_set(mlxsw_sp_port, mt, false, fid->fid,

					     vid);

	}



	return 0;

}



static void mlxsw_sp_port_vlan_flush(struct mlxsw_sp_port *mlxsw_sp_port)

{

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan, *tmp;
@@ -1529,10 +1447,12 @@ mlxsw_sp_port_vlan_get(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid) 


void mlxsw_sp_port_vlan_put(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan)

{

	struct mlxsw_sp_fid *fid = mlxsw_sp_port_vlan->fid;



	if (mlxsw_sp_port_vlan->bridge_port)

		mlxsw_sp_port_vlan_bridge_leave(mlxsw_sp_port_vlan);

	else if (mlxsw_sp_port_vlan->fid)

		mlxsw_sp_port_vlan->fid->leave(mlxsw_sp_port_vlan);

	else if (fid)

		mlxsw_sp_port_vlan_router_leave(mlxsw_sp_port_vlan);



	mlxsw_sp_port_vlan_destroy(mlxsw_sp_port_vlan);

}
@@ -2831,11 +2751,11 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
		goto err_port_dcb_init;

	}



	err = mlxsw_sp_port_vp_mode_set(mlxsw_sp_port, false);

	err = mlxsw_sp_port_fids_init(mlxsw_sp_port);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to set non-virtual mode\n",

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to initialize FIDs\n",

			mlxsw_sp_port->local_port);

		goto err_port_vp_mode_set;

		goto err_port_fids_init;

	}



	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_get(mlxsw_sp_port, 1);
@@ -2865,7 +2785,8 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_vlan_put(mlxsw_sp_port_vlan);

err_port_vlan_get:

err_port_vp_mode_set:

	mlxsw_sp_port_fids_fini(mlxsw_sp_port);

err_port_fids_init:

	mlxsw_sp_port_dcb_fini(mlxsw_sp_port);

err_port_dcb_init:

err_port_ets_init:
@@ -2919,6 +2840,7 @@ static void __mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port) 
	mlxsw_sp->ports[local_port] = NULL;

	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_vlan_flush(mlxsw_sp_port);

	mlxsw_sp_port_fids_fini(mlxsw_sp_port);

	mlxsw_sp_port_dcb_fini(mlxsw_sp_port);

	mlxsw_sp_port_swid_set(mlxsw_sp_port, MLXSW_PORT_SWID_DISABLED_PORT);

	mlxsw_sp_port_module_unmap(mlxsw_sp, mlxsw_sp_port->local_port);
@@ -3478,57 +3400,6 @@ static void mlxsw_sp_traps_fini(struct mlxsw_sp *mlxsw_sp) 
	}

}



static int __mlxsw_sp_flood_init(struct mlxsw_core *mlxsw_core,

				 enum mlxsw_reg_sfgc_type type,

				 enum mlxsw_reg_sfgc_bridge_type bridge_type)

{

	enum mlxsw_flood_table_type table_type;

	enum mlxsw_sp_flood_table flood_table;

	char sfgc_pl[MLXSW_REG_SFGC_LEN];



	if (bridge_type == MLXSW_REG_SFGC_BRIDGE_TYPE_VFID)

		table_type = MLXSW_REG_SFGC_TABLE_TYPE_FID;

	else

		table_type = MLXSW_REG_SFGC_TABLE_TYPE_FID_OFFEST;



	switch (type) {

	case MLXSW_REG_SFGC_TYPE_UNKNOWN_UNICAST:

		flood_table = MLXSW_SP_FLOOD_TABLE_UC;

		break;

	case MLXSW_REG_SFGC_TYPE_UNREGISTERED_MULTICAST_IPV4:

		flood_table = MLXSW_SP_FLOOD_TABLE_MC;

		break;

	default:

		flood_table = MLXSW_SP_FLOOD_TABLE_BC;

	}



	mlxsw_reg_sfgc_pack(sfgc_pl, type, bridge_type, table_type,

			    flood_table);

	return mlxsw_reg_write(mlxsw_core, MLXSW_REG(sfgc), sfgc_pl);

}



static int mlxsw_sp_flood_init(struct mlxsw_sp *mlxsw_sp)

{

	int type, err;



	for (type = 0; type < MLXSW_REG_SFGC_TYPE_MAX; type++) {

		if (type == MLXSW_REG_SFGC_TYPE_RESERVED)

			continue;



		err = __mlxsw_sp_flood_init(mlxsw_sp->core, type,

					    MLXSW_REG_SFGC_BRIDGE_TYPE_VFID);

		if (err)

			return err;



		err = __mlxsw_sp_flood_init(mlxsw_sp->core, type,

					    MLXSW_REG_SFGC_BRIDGE_TYPE_1Q_FID);

		if (err)

			return err;

	}



	return 0;

}



static int mlxsw_sp_lag_init(struct mlxsw_sp *mlxsw_sp)

{

	char slcr_pl[MLXSW_REG_SLCR_LEN];
@@ -3576,16 +3447,6 @@ static int mlxsw_sp_basic_trap_groups_set(struct mlxsw_core *mlxsw_core) 
	return mlxsw_reg_write(mlxsw_core, MLXSW_REG(htgt), htgt_pl);

}



static int mlxsw_sp_dummy_fid_init(struct mlxsw_sp *mlxsw_sp)

{

	return mlxsw_sp_fid_op(mlxsw_sp, MLXSW_SP_DUMMY_FID, true);

}



static void mlxsw_sp_dummy_fid_fini(struct mlxsw_sp *mlxsw_sp)

{

	mlxsw_sp_fid_op(mlxsw_sp, MLXSW_SP_DUMMY_FID, false);

}



static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core,

			 const struct mlxsw_bus_info *mlxsw_bus_info)

{
@@ -3594,8 +3455,6 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 


	mlxsw_sp->core = mlxsw_core;

	mlxsw_sp->bus_info = mlxsw_bus_info;

	INIT_LIST_HEAD(&mlxsw_sp->fids);

	INIT_LIST_HEAD(&mlxsw_sp->vfids.list);



	err = mlxsw_sp_fw_rev_validate(mlxsw_sp);

	if (err) {
@@ -3609,16 +3468,16 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
		return err;

	}



	err = mlxsw_sp_traps_init(mlxsw_sp);

	err = mlxsw_sp_fids_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to set traps\n");

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize FIDs\n");

		return err;

	}



	err = mlxsw_sp_flood_init(mlxsw_sp);

	err = mlxsw_sp_traps_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize flood tables\n");

		goto err_flood_init;

		dev_err(mlxsw_sp->bus_info->dev, "Failed to set traps\n");

		goto err_traps_init;

	}



	err = mlxsw_sp_buffers_init(mlxsw_sp);
@@ -3669,12 +3528,6 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
		goto err_dpipe_init;

	}



	err = mlxsw_sp_dummy_fid_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to init dummy FID\n");

		goto err_dummy_fid_init;

	}



	err = mlxsw_sp_ports_create(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to create ports\n");
@@ -3684,8 +3537,6 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
	return 0;



err_ports_create:

	mlxsw_sp_dummy_fid_fini(mlxsw_sp);

err_dummy_fid_init:

	mlxsw_sp_dpipe_fini(mlxsw_sp);

err_dpipe_init:

	mlxsw_sp_counter_pool_fini(mlxsw_sp);
@@ -3702,8 +3553,9 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
err_lag_init:

	mlxsw_sp_buffers_fini(mlxsw_sp);

err_buffers_init:

err_flood_init:

	mlxsw_sp_traps_fini(mlxsw_sp);

err_traps_init:

	mlxsw_sp_fids_fini(mlxsw_sp);

	return err;

}
@@ -3712,7 +3564,6 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core) 
	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);



	mlxsw_sp_ports_remove(mlxsw_sp);

	mlxsw_sp_dummy_fid_fini(mlxsw_sp);

	mlxsw_sp_dpipe_fini(mlxsw_sp);

	mlxsw_sp_counter_pool_fini(mlxsw_sp);

	mlxsw_sp_acl_fini(mlxsw_sp);
@@ -3722,8 +3573,7 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core) 
	mlxsw_sp_lag_fini(mlxsw_sp);

	mlxsw_sp_buffers_fini(mlxsw_sp);

	mlxsw_sp_traps_fini(mlxsw_sp);

	WARN_ON(!list_empty(&mlxsw_sp->vfids.list));

	WARN_ON(!list_empty(&mlxsw_sp->fids));

	mlxsw_sp_fids_fini(mlxsw_sp);

}



static struct mlxsw_config_profile mlxsw_sp_config_profile = {
@@ -3739,7 +3589,7 @@ static struct mlxsw_config_profile mlxsw_sp_config_profile = { 
	.max_fid_offset_flood_tables	= 3,

	.fid_offset_flood_table_size	= VLAN_N_VID - 1,

	.max_fid_flood_tables		= 3,

	.fid_flood_table_size		= MLXSW_SP_VFID_MAX,

	.fid_flood_table_size		= MLXSW_SP_FID_8021D_MAX,

	.used_max_ib_mc			= 1,

	.max_ib_mc			= 0,

	.used_max_pkey			= 1,
@@ -4009,7 +3859,7 @@ static int mlxsw_sp_port_lag_join(struct mlxsw_sp_port *mlxsw_sp_port, 
	/* Port is no longer usable as a router interface */

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, 1);

	if (mlxsw_sp_port_vlan->fid)

		mlxsw_sp_port_vlan->fid->leave(mlxsw_sp_port_vlan);

		mlxsw_sp_port_vlan_router_leave(mlxsw_sp_port_vlan);



	return 0;

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

+50 −73
Original line number Diff line number Diff line
@@ -54,12 +54,7 @@ 
#include "core_acl_flex_keys.h"

#include "core_acl_flex_actions.h"



#define MLXSW_SP_VFID_BASE VLAN_N_VID

#define MLXSW_SP_VFID_MAX 1024	/* Bridged VLAN interfaces */



#define MLXSW_SP_DUMMY_FID 15359



#define MLXSW_SP_RFID_BASE 15360

#define MLXSW_SP_FID_8021D_MAX 1024



#define MLXSW_SP_MID_MAX 7000
@@ -70,7 +65,6 @@ 
#define MLXSW_SP_KVD_LINEAR_SIZE 65536 /* entries */

#define MLXSW_SP_KVD_GRANULARITY 128



struct mlxsw_sp_port_vlan;

struct mlxsw_sp_port;

struct mlxsw_sp_rif;
@@ -79,13 +73,19 @@ struct mlxsw_sp_upper { 
	unsigned int ref_count;

};



struct mlxsw_sp_fid {

	void (*leave)(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);

	struct list_head list;

	unsigned int ref_count;

	struct net_device *dev;

	struct mlxsw_sp_rif *rif;

	u16 fid;

enum mlxsw_sp_rif_type {

	MLXSW_SP_RIF_TYPE_SUBPORT,

	MLXSW_SP_RIF_TYPE_VLAN,

	MLXSW_SP_RIF_TYPE_FID,

	MLXSW_SP_RIF_TYPE_MAX,

};



enum mlxsw_sp_fid_type {

	MLXSW_SP_FID_TYPE_8021Q,

	MLXSW_SP_FID_TYPE_8021D,

	MLXSW_SP_FID_TYPE_RFID,

	MLXSW_SP_FID_TYPE_DUMMY,

	MLXSW_SP_FID_TYPE_MAX,

};



struct mlxsw_sp_mid {
@@ -96,21 +96,6 @@ struct mlxsw_sp_mid { 
	unsigned int ref_count;

};



static inline u16 mlxsw_sp_vfid_to_fid(u16 vfid)

{

	return MLXSW_SP_VFID_BASE + vfid;

}



static inline u16 mlxsw_sp_fid_to_vfid(u16 fid)

{

	return fid - MLXSW_SP_VFID_BASE;

}



static inline bool mlxsw_sp_fid_is_vfid(u16 fid)

{

	return fid >= MLXSW_SP_VFID_BASE && fid < MLXSW_SP_DUMMY_FID;

}



enum mlxsw_sp_span_type {

	MLXSW_SP_SPAN_EGRESS,

	MLXSW_SP_SPAN_INGRESS
@@ -154,13 +139,9 @@ struct mlxsw_sp_bridge; 
struct mlxsw_sp_router;

struct mlxsw_sp_acl;

struct mlxsw_sp_counter_pool;

struct mlxsw_sp_fid_core;



struct mlxsw_sp {

	struct {

		struct list_head list;

		DECLARE_BITMAP(mapped, MLXSW_SP_VFID_MAX);

	} vfids;

	struct list_head fids;	/* VLAN-aware bridge FIDs */

	struct mlxsw_sp_port **ports;

	struct mlxsw_core *core;

	const struct mlxsw_bus_info *bus_info;
@@ -171,6 +152,7 @@ struct mlxsw_sp { 
	struct mlxsw_sp_bridge *bridge;

	struct mlxsw_sp_router *router;

	struct mlxsw_sp_acl *acl;

	struct mlxsw_sp_fid_core *fid_core;

	struct {

		DECLARE_BITMAP(usage, MLXSW_SP_KVD_LINEAR_SIZE);

	} kvdl;
@@ -205,6 +187,7 @@ struct mlxsw_sp_port_sample { 
};



struct mlxsw_sp_bridge_port;

struct mlxsw_sp_fid;



struct mlxsw_sp_port_vlan {

	struct list_head list;
@@ -247,7 +230,6 @@ struct mlxsw_sp_port { 
		struct delayed_work update_dw;

	} hw_stats;

	struct mlxsw_sp_port_sample *sample;

	unsigned int nr_port_vid_map;  /* {Port, VID} => FID mappings */

	struct list_head vlans_list;

};
@@ -290,35 +272,10 @@ mlxsw_sp_port_vlan_find_by_vid(const struct mlxsw_sp_port *mlxsw_sp_port, 
	return NULL;

}



static inline struct mlxsw_sp_fid *mlxsw_sp_fid_find(struct mlxsw_sp *mlxsw_sp,

						     u16 fid)

{

	struct mlxsw_sp_fid *f;



	list_for_each_entry(f, &mlxsw_sp->fids, list)

		if (f->fid == fid)

			return f;



	return NULL;

}



static inline struct mlxsw_sp_fid *

mlxsw_sp_vfid_find(const struct mlxsw_sp *mlxsw_sp,

		   const struct net_device *br_dev)

{

	struct mlxsw_sp_fid *f;



	list_for_each_entry(f, &mlxsw_sp->vfids.list, list)

		if (f->dev == br_dev)

			return f;



	return NULL;

}



enum mlxsw_sp_flood_table {

	MLXSW_SP_FLOOD_TABLE_UC,

	MLXSW_SP_FLOOD_TABLE_BC,

	MLXSW_SP_FLOOD_TABLE_MC,

enum mlxsw_sp_flood_type {

	MLXSW_SP_FLOOD_TYPE_UC,

	MLXSW_SP_FLOOD_TYPE_BC,

	MLXSW_SP_FLOOD_TYPE_MC,

};



int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp);
@@ -362,15 +319,10 @@ int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp); 
void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_port_switchdev_init(struct mlxsw_sp_port *mlxsw_sp_port);

void mlxsw_sp_port_switchdev_fini(struct mlxsw_sp_port *mlxsw_sp_port);

int mlxsw_sp_port_vid_to_fid_set(struct mlxsw_sp_port *mlxsw_sp_port,

				 enum mlxsw_reg_svfa_mt mt, bool valid, u16 fid,

				 u16 vid);

int mlxsw_sp_port_vlan_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid_begin,

			   u16 vid_end, bool is_member, bool untagged);

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

			bool adding);

struct mlxsw_sp_fid *mlxsw_sp_fid_create(struct mlxsw_sp *mlxsw_sp, u16 fid);

int mlxsw_sp_fid_op(struct mlxsw_sp *mlxsw_sp, u16 fid_index, bool valid);

void

mlxsw_sp_port_vlan_bridge_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);

int mlxsw_sp_port_bridge_join(struct mlxsw_sp_port *mlxsw_sp_port,
@@ -393,11 +345,10 @@ int mlxsw_sp_port_ets_maxrate_set(struct mlxsw_sp_port *mlxsw_sp_port, 
				  u8 next_index, u32 maxrate);

int mlxsw_sp_port_vid_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

			      u8 state);

int mlxsw_sp_port_vp_mode_set(struct mlxsw_sp_port *mlxsw_sp_port, bool enable);

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);

int mlxsw_sp_port_vp_mode_trans(struct mlxsw_sp_port *mlxsw_sp_port);

int mlxsw_sp_port_vlan_mode_trans(struct mlxsw_sp_port *mlxsw_sp_port);

struct mlxsw_sp_port_vlan *

mlxsw_sp_port_vlan_get(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid);

void mlxsw_sp_port_vlan_put(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);
@@ -426,10 +377,11 @@ int mlxsw_sp_router_netevent_event(struct notifier_block *unused, 
int mlxsw_sp_netdevice_router_port_event(struct net_device *dev);

int mlxsw_sp_inetaddr_event(struct notifier_block *unused,

			    unsigned long event, void *ptr);

void mlxsw_sp_rif_bridge_destroy(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_rif *rif);

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);



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

			u32 *p_entry_index);
@@ -535,6 +487,8 @@ int mlxsw_sp_acl_rule_get_stats(struct mlxsw_sp *mlxsw_sp, 
				struct mlxsw_sp_acl_rule *rule,

				u64 *packets, u64 *bytes, u64 *last_use);



struct mlxsw_sp_fid *mlxsw_sp_acl_dummy_fid(struct mlxsw_sp *mlxsw_sp);



int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_acl_fini(struct mlxsw_sp *mlxsw_sp);
@@ -554,4 +508,27 @@ int mlxsw_sp_flow_counter_alloc(struct mlxsw_sp *mlxsw_sp, 
void mlxsw_sp_flow_counter_free(struct mlxsw_sp *mlxsw_sp,

				unsigned int counter_index);



int mlxsw_sp_fid_flood_set(struct mlxsw_sp_fid *fid,

			   enum mlxsw_sp_flood_type packet_type, u8 local_port,

			   bool member);

int mlxsw_sp_fid_port_vid_map(struct mlxsw_sp_fid *fid,

			      struct mlxsw_sp_port *mlxsw_sp_port, u16 vid);

void mlxsw_sp_fid_port_vid_unmap(struct mlxsw_sp_fid *fid,

				 struct mlxsw_sp_port *mlxsw_sp_port, u16 vid);

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);

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);

struct mlxsw_sp_fid *mlxsw_sp_fid_rfid_get(struct mlxsw_sp *mlxsw_sp,

					   u16 rif_index);

struct mlxsw_sp_fid *mlxsw_sp_fid_dummy_get(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_fid_put(struct mlxsw_sp_fid *fid);

int mlxsw_sp_port_fids_init(struct mlxsw_sp_port *mlxsw_sp_port);

void mlxsw_sp_port_fids_fini(struct mlxsw_sp_port *mlxsw_sp_port);

int mlxsw_sp_fids_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_fids_fini(struct mlxsw_sp *mlxsw_sp);



#endif

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

+17 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct mlxsw_sp_acl { 
	struct mlxsw_sp *mlxsw_sp;

	struct mlxsw_afk *afk;

	struct mlxsw_afa *afa;

	struct mlxsw_sp_fid *dummy_fid;

	const struct mlxsw_sp_acl_ops *ops;

	struct rhashtable ruleset_ht;

	struct list_head rules;
@@ -112,6 +113,11 @@ static const struct rhashtable_params mlxsw_sp_acl_rule_ht_params = { 
	.automatic_shrinking = true,

};



struct mlxsw_sp_fid *mlxsw_sp_acl_dummy_fid(struct mlxsw_sp *mlxsw_sp)

{

	return mlxsw_sp->acl->dummy_fid;

}



static struct mlxsw_sp_acl_ruleset *

mlxsw_sp_acl_ruleset_create(struct mlxsw_sp *mlxsw_sp,

			    const struct mlxsw_sp_acl_profile_ops *ops)
@@ -676,6 +682,7 @@ static const struct mlxsw_afa_ops mlxsw_sp_act_afa_ops = { 
int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp)

{

	const struct mlxsw_sp_acl_ops *acl_ops = &mlxsw_sp_acl_tcam_ops;

	struct mlxsw_sp_fid *fid;

	struct mlxsw_sp_acl *acl;

	int err;
@@ -706,6 +713,13 @@ int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp) 
	if (err)

		goto err_rhashtable_init;



	fid = mlxsw_sp_fid_dummy_get(mlxsw_sp);

	if (IS_ERR(fid)) {

		err = PTR_ERR(fid);

		goto err_fid_get;

	}

	acl->dummy_fid = fid;



	INIT_LIST_HEAD(&acl->rules);

	err = acl_ops->init(mlxsw_sp, acl->priv);

	if (err)
@@ -721,6 +735,8 @@ int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp) 
	return 0;



err_acl_ops_init:

	mlxsw_sp_fid_put(fid);

err_fid_get:

	rhashtable_destroy(&acl->ruleset_ht);

err_rhashtable_init:

	mlxsw_afa_destroy(acl->afa);
@@ -739,6 +755,7 @@ void mlxsw_sp_acl_fini(struct mlxsw_sp *mlxsw_sp) 
	cancel_delayed_work_sync(&mlxsw_sp->acl->rule_activity_update.dw);

	acl_ops->fini(mlxsw_sp, acl->priv);

	WARN_ON(!list_empty(&acl->rules));

	mlxsw_sp_fid_put(acl->dummy_fid);

	rhashtable_destroy(&acl->ruleset_ht);

	mlxsw_afa_destroy(acl->afa);

	mlxsw_afk_destroy(acl->afk);

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

0 → 100644
+978 −0

File added.

Preview size limit exceeded, changes collapsed.