Commit 11d8d98c authored by Eric Woudstra's avatar Eric Woudstra Committed by David S. Miller
Browse files

mt7530 fix mt7530_fdb_write vid missing ivl bit 

According to reference guides mt7530 (mt7620) and mt7531:

NOTE: When IVL is reset, MAC[47:0] and FID[2:0] will be used to
read/write the address table. When IVL is set, MAC[47:0] and CVID[11:0]
will be used to read/write the address table.

Since the function only fills in CVID and no FID, we need to set the
IVL bit. The existing code does not set it.

This is a fix for the issue I dropped here earlier:

http://lists.infradead.org/pipermail/linux-mediatek/2021-June/025697.html



With this patch, it is now possible to delete the 'self' fdb entry
manually. However, wifi roaming still has the same issue, the entry
does not get deleted automatically. Wifi roaming also needs a fix
somewhere else to function correctly in combination with vlan.

Signed-off-by: default avatarEric Woudstra <ericwouds@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2cc3aeb5

drivers/net/dsa/mt7530.c

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ mt7530_fdb_write(struct mt7530_priv *priv, u16 vid, 
	int i;



	reg[1] |= vid & CVID_MASK;

	reg[1] |= ATA2_IVL;

	reg[2] |= (aging & AGE_TIMER_MASK) << AGE_TIMER;

	reg[2] |= (port_mask & PORT_MAP_MASK) << PORT_MAP;

	/* STATIC_ENT indicate that entry is static wouldn't

drivers/net/dsa/mt7530.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ enum mt753x_bpdu_port_fw { 
#define  STATIC_EMP			0

#define  STATIC_ENT			3

#define MT7530_ATA2			0x78

#define  ATA2_IVL			BIT(15)



/* Register for address table write data */

#define MT7530_ATWD			0x7c