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

Commit 0fb78a4e authored by Nogah Frankel's avatar Nogah Frankel Committed by David S. Miller
Browse files

mlxsw: Add option to choose trap group 



Currently, we set the trap group to pre-determined option, based on whether
it is an rx or event trap.
This commit adds a possibility to chose the trap group, so it can be set
to different values in the following patches.

Signed-off-by: default avatarNogah Frankel <nogahf@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d570b7ee

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

+15 −14
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ struct mlxsw_listener { 
	bool is_event;

};



#define MLXSW_RXL(_func, _trap_id, _action, _is_ctrl, _unreg_action)	\

#define MLXSW_RXL(_func, _trap_id, _action, _is_ctrl, _trap_group,	\

		  _unreg_action)					\

	{								\

		.trap_id = MLXSW_TRAP_ID_##_trap_id,			\

		.u.rx_listener =					\
@@ -114,12 +115,12 @@ struct mlxsw_listener { 
		},							\

		.action = MLXSW_REG_HPKT_ACTION_##_action,		\

		.unreg_action = MLXSW_REG_HPKT_ACTION_##_unreg_action,	\

		.trap_group = MLXSW_REG_HTGT_TRAP_GROUP_RX,		\

		.trap_group = MLXSW_REG_HTGT_TRAP_GROUP_##_trap_group,	\

		.is_ctrl = _is_ctrl,					\

		.is_event = false,					\

	}



#define MLXSW_EVENTL(_func, _trap_id)				\

#define MLXSW_EVENTL(_func, _trap_id, _trap_group)			\

	{								\

		.trap_id = MLXSW_TRAP_ID_##_trap_id,			\

		.u.event_listener =					\
@@ -128,7 +129,7 @@ struct mlxsw_listener { 
			.trap_id = MLXSW_TRAP_ID_##_trap_id,		\

		},							\

		.action = MLXSW_REG_HPKT_ACTION_TRAP_TO_CPU,		\

		.trap_group = MLXSW_REG_HTGT_TRAP_GROUP_EMAD,	\

		.trap_group = MLXSW_REG_HTGT_TRAP_GROUP_##_trap_group,	\

		.is_ctrl = false,					\

		.is_event = true,					\

	}

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

+4 −4
Original line number Diff line number Diff line
@@ -2732,15 +2732,15 @@ static void mlxsw_sp_rx_listener_mark_func(struct sk_buff *skb, u8 local_port, 


#define MLXSW_SP_RXL_NO_MARK(_trap_id, _action, _is_ctrl)		\

	MLXSW_RXL(mlxsw_sp_rx_listener_no_mark_func, _trap_id, _action,	\

		  _is_ctrl, DISCARD)

		  _is_ctrl, RX, DISCARD)



#define MLXSW_SP_RXL_MARK(_trap_id, _action, _is_ctrl)			\

	MLXSW_RXL(mlxsw_sp_rx_listener_mark_func, _trap_id, _action,	\

		  _is_ctrl, DISCARD)

		  _is_ctrl, RX, DISCARD)



static const struct mlxsw_listener mlxsw_sp_listener[] = {

	/* Events */

	MLXSW_EVENTL(mlxsw_sp_pude_event_func, PUDE),

	MLXSW_EVENTL(mlxsw_sp_pude_event_func, PUDE, EMAD),

	/* L2 traps */

	MLXSW_SP_RXL_NO_MARK(STP, TRAP_TO_CPU, true),

	MLXSW_SP_RXL_NO_MARK(LACP, TRAP_TO_CPU, true),

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

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static void mlxsw_sib_pude_event_func(const struct mlxsw_reg_info *reg, 
}



static const struct mlxsw_listener mlxsw_sib_listener[] = {

	MLXSW_EVENTL(mlxsw_sib_pude_event_func, PUDE),

	MLXSW_EVENTL(mlxsw_sib_pude_event_func, PUDE, EMAD),

};



static int mlxsw_sib_taps_init(struct mlxsw_sib *mlxsw_sib)

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

+2 −2
Original line number Diff line number Diff line
@@ -1450,10 +1450,10 @@ static int mlxsw_sx_port_type_set(struct mlxsw_core *mlxsw_core, u8 local_port, 


#define MLXSW_SX_RXL(_trap_id)						\

	MLXSW_RXL(mlxsw_sx_rx_listener_func, _trap_id, TRAP_TO_CPU,	\

		  false, FORWARD)

		  false, RX, FORWARD)



static const struct mlxsw_listener mlxsw_sx_listener[] = {

	MLXSW_EVENTL(mlxsw_sx_pude_event_func, PUDE),

	MLXSW_EVENTL(mlxsw_sx_pude_event_func, PUDE, EMAD),

	MLXSW_SX_RXL(FDB_MC),

	MLXSW_SX_RXL(STP),

	MLXSW_SX_RXL(LACP),