korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-09 15:24:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: dsa: mt7530: rework mt753[01]_setup

Browse Source 
[ Upstream commit 6e19bc26cc ]

Enumerate available cpu-ports instead of using hardcoded constant.

Suggested-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 120a56b01b ("net: dsa: mt7530: fix network connectivity with multiple CPU ports")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Frank Wunderlich 2022-06-10 19:05:38 +02:00 committed by Greg Kroah-Hartman
parent 9902f91cf6
commit 0753c1ef24
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/dsa/mt7530.c
View File

@ -2094,11 +2094,12 @@ static int
mt7530_setup(struct dsa_switch *ds) mt7530_setup(struct dsa_switch *ds)
{ {
struct mt7530_priv *priv = ds->priv; struct mt7530_priv *priv = ds->priv;
struct device_node *dn = NULL;
struct device_node *phy_node; struct device_node *phy_node;
struct device_node *mac_np; struct device_node *mac_np;
struct mt7530_dummy_poll p; struct mt7530_dummy_poll p;
phy_interface_t interface; phy_interface_t interface;
struct device_node *dn; struct dsa_port *cpu_dp;
u32 id, val; u32 id, val;
int ret, i; int ret, i;
@ -2106,7 +2107,19 @@ mt7530_setup(struct dsa_switch *ds)
* controller also is the container for two GMACs nodes representing * controller also is the container for two GMACs nodes representing
* as two netdev instances. * as two netdev instances.
*/ */
dn = dsa_to_port(ds, MT7530_CPU_PORT)->master->dev.of_node->parent; dsa_switch_for_each_cpu_port(cpu_dp, ds) {
dn = cpu_dp->master->dev.of_node->parent;
/* It doesn't matter which CPU port is found first,
* their masters should share the same parent OF node
*/
break;
}
if (!dn) {
dev_err(ds->dev, "parent OF node of DSA master not found");
return -EINVAL;
}
ds->assisted_learning_on_cpu_port = true; ds->assisted_learning_on_cpu_port = true;
ds->mtu_enforcement_ingress = true; ds->mtu_enforcement_ingress = true;
@ -2279,6 +2292,7 @@ mt7531_setup(struct dsa_switch *ds)
{ {
struct mt7530_priv *priv = ds->priv; struct mt7530_priv *priv = ds->priv;
struct mt7530_dummy_poll p; struct mt7530_dummy_poll p;
struct dsa_port *cpu_dp;
u32 val, id; u32 val, id;
int ret, i; int ret, i;
@ -2353,8 +2367,11 @@ mt7531_setup(struct dsa_switch *ds)
CORE_PLL_GROUP4, val); CORE_PLL_GROUP4, val);
/* BPDU to CPU port */ /* BPDU to CPU port */
dsa_switch_for_each_cpu_port(cpu_dp, ds) {
mt7530_rmw(priv, MT7531_CFC, MT7531_CPU_PMAP_MASK, mt7530_rmw(priv, MT7531_CFC, MT7531_CPU_PMAP_MASK,
BIT(MT7530_CPU_PORT)); BIT(cpu_dp->index));
break;
}
mt7530_rmw(priv, MT753X_BPC, MT753X_BPDU_PORT_FW_MASK, mt7530_rmw(priv, MT753X_BPC, MT753X_BPDU_PORT_FW_MASK,
MT753X_BPDU_CPU_ONLY); MT753X_BPDU_CPU_ONLY);