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

Commit 4c7ea3c0 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: disable SA learning for DSA and CPU ports 



Frames with DSA headers passing to/from the CPU were taking place in the
MAC learning on these ports, resulting in incorrect ATU entries. Disable
learning on these ports.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5ba3f7d6

drivers/net/dsa/mv88e6xxx.c

+6 −2
Original line number Diff line number Diff line
@@ -2029,8 +2029,12 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port) 
	 * a port bitmap that has only the bit for this port set and

	 * the other bits clear.

	 */

	ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_ASSOC_VECTOR,

				   1 << port);

	reg = 1 << port;

	/* Disable learning for DSA and CPU ports */

	if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))

		reg = PORT_ASSOC_VECTOR_LOCKED_PORT;



	ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_ASSOC_VECTOR, reg);

	if (ret)

		goto abort;

drivers/net/dsa/mv88e6xxx.h

+5 −0
Original line number Diff line number Diff line
@@ -159,6 +159,11 @@ 
#define PORT_RATE_CONTROL	0x09

#define PORT_RATE_CONTROL_2	0x0a

#define PORT_ASSOC_VECTOR	0x0b

#define PORT_ASSOC_VECTOR_HOLD_AT_1		BIT(15)

#define PORT_ASSOC_VECTOR_INT_AGE_OUT		BIT(14)

#define PORT_ASSOC_VECTOR_LOCKED_PORT		BIT(13)

#define PORT_ASSOC_VECTOR_IGNORE_WRONG		BIT(12)

#define PORT_ASSOC_VECTOR_REFRESH_LOCKED	BIT(11)

#define PORT_ATU_CONTROL	0x0c

#define PORT_PRI_OVERRIDE	0x0d

#define PORT_ETH_TYPE		0x0f