tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: dsa: rzn1-a5psw: use a5psw_reg_rmw() to modify flooding resolution

Browse Source 
.port_bridge_flags will be added and allows to modify the flood mask
independently for each port. Keeping the existing bridged_ports write
in a5psw_flooding_set_resolution() would potentially messed up this.
Use a read-modify-write to set that value and move bridged_ports
handling in bridge_port_join/leave.

Signed-off-by: Clément Léger <clement.leger@bootlin.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Clément Léger
2023-08-10 11:36:49 +02:00
committed by David S. Miller
parent 61f98da469
commit 6cf30fdd7b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/dsa/rzn1_a5psw.c
+8 -6
View File
@@ -331,13 +331,9 @@ static void a5psw_flooding_set_resolution(struct a5psw *a5psw, int port,
A5PSW_MCAST_DEF_MASK};
int i;
if (set)
a5psw->bridged_ports |= BIT(port);
else
a5psw->bridged_ports &= ~BIT(port);
for (i = 0; i < ARRAY_SIZE(offsets); i++)
a5psw_reg_writel(a5psw, offsets[i], a5psw->bridged_ports);
a5psw_reg_rmw(a5psw, offsets[i], BIT(port),
set ? BIT(port) : 0);
}
static void a5psw_port_set_standalone(struct a5psw *a5psw, int port,
@@ -365,6 +361,8 @@ static int a5psw_port_bridge_join(struct dsa_switch *ds, int port,
a5psw->br_dev = bridge.dev;
a5psw_port_set_standalone(a5psw, port, false);
a5psw->bridged_ports |= BIT(port);
return 0;
}
@@ -373,6 +371,8 @@ static void a5psw_port_bridge_leave(struct dsa_switch *ds, int port,
{
struct a5psw *a5psw = ds->priv;
a5psw->bridged_ports &= ~BIT(port);
a5psw_port_set_standalone(a5psw, port, true);
/* No more ports bridged */
@@ -992,6 +992,8 @@ static int a5psw_probe(struct platform_device *pdev)
if (IS_ERR(a5psw->base))
return PTR_ERR(a5psw->base);
a5psw->bridged_ports = BIT(A5PSW_CPU_PORT);
ret = a5psw_pcs_get(a5psw);
if (ret)
return ret;