Commit b77918ad authored Jun 17, 2023 by Arınç ÜNAL Committed by sanglipeng Nov 30, 2023

net: dsa: mt7530: fix trapping frames on non-MT7621 SoC MT7530 switch

stable inclusion
from stable-v5.10.186
commit cebb5cee098442bec42232e06309b93edba4acee
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8J4KH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cebb5cee098442bec42232e06309b93edba4acee



--------------------------------

[ Upstream commit 4ae90f90 ]

All MT7530 switch IP variants share the MT7530_MFC register, but the
current driver only writes it for the switch variant that is integrated in
the MT7621 SoC. Modify the code to include all MT7530 derivatives.

Fixes: b8f126a8 ("net-next: dsa: add dsa support for Mediatek MT7530 switch")
Suggested-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent 769a2dba

drivers/net/dsa/mt7530.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -966,7 +966,7 @@ mt753x_cpu_port_enable(struct dsa_switch *ds, int port)
		mt7530_rmw(priv, MT7530_MFC, UNM_FFP_MASK, UNM_FFP(BIT(port)));

		/* Set CPU port number */
		if (priv->id == ID_MT7621)
		if (priv->id == ID_MT7530 \|\| priv->id == ID_MT7621)
		mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN \| CPU_PORT(port));

		/* CPU port gets connected to all user ports of