net: dsa: mt7530: disable learning on standalone ports
Subsystems (4)
PATCH 1/1 net: dsa: mt7530: disable learning on standalone ports
This is a partial backport of commit 5a30833b9a16f8d1aa15de06636f9317ca51f9df ("net: dsa: mt7530: support MDB and bridge flag operations") upstream.
Make sure that the standalone ports start up with learning disabled.
Signed-off-by DENG Qingfang <[email protected]>
--- drivers/net/dsa/mt7530.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/net/dsa/mt7530.c +14 -2
@@ -1083,6 +1083,8 @@ mt7530_port_bridge_join(struct dsa_switch *ds, int port, PCR_MATRIX_MASK, PCR_MATRIX(port_bitmap)); priv->ports[port].pm |=PCR_MATRIX (port_bitmap); +mt7530_clear (priv,MT7530_PSC_P (port),SA_DIS ); +mutex_unlock (&priv->reg_mutex);return 0 ;
@@ -1183,6 +1185,8 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, PCR_MATRIX(BIT(MT7530_CPU_PORT))); priv->ports[port].pm =PCR_MATRIX (BIT (MT7530_CPU_PORT )); +mt7530_set (priv,MT7530_PSC_P (port),SA_DIS ); +mutex_unlock (&priv->reg_mutex); }
@@ -1636,9 +1640,13 @@ mt7530_setup(struct dsa_switch *ds) ret =mt753x_cpu_port_enable (ds, i);if (ret)return ret; - }else + }else {mt7530_port_disable (ds, i); +/* Disable learning by default on all user ports */ +mt7530_set (priv,MT7530_PSC_P (i),SA_DIS ); + } +/* Enable consistent egress tag */ mt7530_rmw (priv,MT7530_PVC_P (i),PVC_EG_TAG_MASK ,PVC_EG_TAG (MT7530_VLAN_EG_CONSISTENT ));
@@ -1792,9 +1800,13 @@ mt7531_setup(struct dsa_switch *ds) ret =mt753x_cpu_port_enable (ds, i);if (ret)return ret; - }else + }else {mt7530_port_disable (ds, i); +/* Disable learning by default on all user ports */ +mt7530_set (priv,MT7530_PSC_P (i),SA_DIS ); + } +/* Enable consistent egress tag */ mt7530_rmw (priv,MT7530_PVC_P (i),PVC_EG_TAG_MASK ,PVC_EG_TAG (MT7530_VLAN_EG_CONSISTENT ));
Signature · 1 line
2.25.1