c4e6a147a6
Import patches accepted upstream introducing port isolation feature
on MT7530 switches:
- [net-next,v3,1/2] net: dsa: mt7530: factor out bridge join/leave logic
https://git.kernel.org/netdev/net-next/c/c25c961fc7f3
- [net-next,v3,2/2] net: dsa: mt7530: add support for bridge port isolation
https://git.kernel.org/netdev/net-next/c/3d49ee2127c2
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
80 lines
2.5 KiB
Diff
80 lines
2.5 KiB
Diff
From 3d49ee2127c26fd2c77944fd2e3168c057f99439 Mon Sep 17 00:00:00 2001
|
||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||
Date: Tue, 18 Jun 2024 09:17:13 +0200
|
||
Subject: [PATCH 2/2] net: dsa: mt7530: add support for bridge port isolation
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Remove a pair of ports from the port matrix when both ports have the
|
||
isolated flag set.
|
||
|
||
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
|
||
Reviewed-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||
Tested-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
---
|
||
drivers/net/dsa/mt7530.c | 18 ++++++++++++++++--
|
||
drivers/net/dsa/mt7530.h | 1 +
|
||
2 files changed, 17 insertions(+), 2 deletions(-)
|
||
|
||
--- a/drivers/net/dsa/mt7530.c
|
||
+++ b/drivers/net/dsa/mt7530.c
|
||
@@ -1311,6 +1311,7 @@ static void mt7530_update_port_member(st
|
||
struct dsa_port *cpu_dp = dp->cpu_dp;
|
||
u32 port_bitmap = BIT(cpu_dp->index);
|
||
int other_port;
|
||
+ bool isolated;
|
||
|
||
dsa_switch_for_each_user_port(other_dp, priv->ds) {
|
||
other_port = other_dp->index;
|
||
@@ -1327,7 +1328,9 @@ static void mt7530_update_port_member(st
|
||
if (!dsa_port_offloads_bridge_dev(other_dp, bridge_dev))
|
||
continue;
|
||
|
||
- if (join) {
|
||
+ isolated = p->isolated && other_p->isolated;
|
||
+
|
||
+ if (join && !isolated) {
|
||
other_p->pm |= PCR_MATRIX(BIT(port));
|
||
port_bitmap |= BIT(other_port);
|
||
} else {
|
||
@@ -1354,7 +1357,7 @@ mt7530_port_pre_bridge_flags(struct dsa_
|
||
struct netlink_ext_ack *extack)
|
||
{
|
||
if (flags.mask & ~(BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD |
|
||
- BR_BCAST_FLOOD))
|
||
+ BR_BCAST_FLOOD | BR_ISOLATED))
|
||
return -EINVAL;
|
||
|
||
return 0;
|
||
@@ -1383,6 +1386,17 @@ mt7530_port_bridge_flags(struct dsa_swit
|
||
mt7530_rmw(priv, MT753X_MFC, BC_FFP(BIT(port)),
|
||
flags.val & BR_BCAST_FLOOD ? BC_FFP(BIT(port)) : 0);
|
||
|
||
+ if (flags.mask & BR_ISOLATED) {
|
||
+ struct dsa_port *dp = dsa_to_port(ds, port);
|
||
+ struct net_device *bridge_dev = dsa_port_bridge_dev_get(dp);
|
||
+
|
||
+ priv->ports[port].isolated = !!(flags.val & BR_ISOLATED);
|
||
+
|
||
+ mutex_lock(&priv->reg_mutex);
|
||
+ mt7530_update_port_member(priv, port, bridge_dev, true);
|
||
+ mutex_unlock(&priv->reg_mutex);
|
||
+ }
|
||
+
|
||
return 0;
|
||
}
|
||
|
||
--- a/drivers/net/dsa/mt7530.h
|
||
+++ b/drivers/net/dsa/mt7530.h
|
||
@@ -721,6 +721,7 @@ struct mt7530_fdb {
|
||
*/
|
||
struct mt7530_port {
|
||
bool enable;
|
||
+ bool isolated;
|
||
u32 pm;
|
||
u16 pvid;
|
||
struct phylink_pcs *sgmii_pcs;
|