Commit 8332cf6f authored by Arınç ÜNAL's avatar Arınç ÜNAL Committed by David S. Miller
Browse files

net: dsa: mt7530: fix handling of LLDP frames 



LLDP frames are link-local frames, therefore they must be trapped to the
CPU port. Currently, the MT753X switches treat LLDP frames as regular
multicast frames, therefore flooding them to user ports. To fix this, set
LLDP frames to be trapped to the CPU port(s).

Fixes: b8f126a8 ("net-next: dsa: add dsa support for Mediatek MT7530 switch")
Signed-off-by: default avatarArınç ÜNAL <arinc.unal@arinc9.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7c66073

drivers/net/dsa/mt7530.c

+4 −0
Original line number Diff line number Diff line
@@ -991,6 +991,10 @@ mt753x_trap_frames(struct mt7530_priv *priv) 
	/* Trap BPDUs to the CPU port(s) */

	mt7530_rmw(priv, MT753X_BPC, MT753X_BPDU_PORT_FW_MASK,

		   MT753X_BPDU_CPU_ONLY);



	/* Trap LLDP frames with :0E MAC DA to the CPU port(s) */

	mt7530_rmw(priv, MT753X_RGAC2, MT753X_R0E_PORT_FW_MASK,

		   MT753X_R0E_PORT_FW(MT753X_BPDU_CPU_ONLY));

}



static int

drivers/net/dsa/mt7530.h

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ enum mt753x_id { 
#define MT753X_BPC			0x24

#define  MT753X_BPDU_PORT_FW_MASK	GENMASK(2, 0)



/* Register for :03 and :0E MAC DA frame control */

#define MT753X_RGAC2			0x2c

#define  MT753X_R0E_PORT_FW_MASK	GENMASK(18, 16)

#define  MT753X_R0E_PORT_FW(x)		FIELD_PREP(MT753X_R0E_PORT_FW_MASK, x)



enum mt753x_bpdu_port_fw {

	MT753X_BPDU_FOLLOW_MFC,

	MT753X_BPDU_CPU_EXCLUDE = 4,