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

mlxsw: spectrum: Use same trap group for MLD and IGMP packets 



Both packet types are needed for the same reason (multicast snooping),
so associate them with the same trap group.

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 debb7af6

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

+0 −1
Original line number Diff line number Diff line
@@ -5542,7 +5542,6 @@ enum mlxsw_reg_htgt_trap_group { 
	MLXSW_REG_HTGT_TRAP_GROUP_SP_IP2ME,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_DHCP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_EVENT,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_MLD,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_ND,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_LBERROR,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_PTP0,

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

+7 −9
Original line number Diff line number Diff line
@@ -4054,14 +4054,14 @@ static const struct mlxsw_listener mlxsw_sp_listener[] = { 
	MLXSW_SP_RXL_MARK(ARPBC, MIRROR_TO_CPU, ARP, false),

	MLXSW_SP_RXL_MARK(ARPUC, MIRROR_TO_CPU, ARP, false),

	MLXSW_SP_RXL_NO_MARK(FID_MISS, TRAP_TO_CPU, IP2ME, false),

	MLXSW_SP_RXL_MARK(IPV6_MLDV12_LISTENER_QUERY, MIRROR_TO_CPU, IPV6_MLD,

			  false),

	MLXSW_SP_RXL_NO_MARK(IPV6_MLDV1_LISTENER_REPORT, TRAP_TO_CPU, IPV6_MLD,

			     false),

	MLXSW_SP_RXL_NO_MARK(IPV6_MLDV1_LISTENER_DONE, TRAP_TO_CPU, IPV6_MLD,

			     false),

	MLXSW_SP_RXL_NO_MARK(IPV6_MLDV2_LISTENER_REPORT, TRAP_TO_CPU, IPV6_MLD,

	MLXSW_SP_RXL_MARK(IPV6_MLDV12_LISTENER_QUERY, MIRROR_TO_CPU,

			  MC_SNOOPING, false),

	MLXSW_SP_RXL_NO_MARK(IPV6_MLDV1_LISTENER_REPORT, TRAP_TO_CPU,

			     MC_SNOOPING, false),

	MLXSW_SP_RXL_NO_MARK(IPV6_MLDV1_LISTENER_DONE, TRAP_TO_CPU, MC_SNOOPING,

			     false),

	MLXSW_SP_RXL_NO_MARK(IPV6_MLDV2_LISTENER_REPORT, TRAP_TO_CPU,

			     MC_SNOOPING, false),

	/* L3 traps */

	MLXSW_SP_RXL_L3_MARK(LBERROR, MIRROR_TO_CPU, LBERROR, false),

	MLXSW_SP_RXL_MARK(IP2ME, TRAP_TO_CPU, IP2ME, false),
@@ -4156,7 +4156,6 @@ static int mlxsw_sp_cpu_policers_set(struct mlxsw_core *mlxsw_core) 
			burst_size = 7;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_MC_SNOOPING:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_MLD:

			rate = 16 * 1024;

			burst_size = 10;

			break;
@@ -4237,7 +4236,6 @@ static int mlxsw_sp_trap_groups_set(struct mlxsw_core *mlxsw_core) 
			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_MC_SNOOPING:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IP2ME:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_MLD:

			priority = 3;

			tc = 3;

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE