net: dsa: mt7530: add support for bridge port isolation

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>

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 9ce27ce07d77e56692447eb42df42944b9490518..ec18e68bf3a8cf0bef1ab6d6c133c6b9a1591108 100644 (file)
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1311,6 +1311,7 @@ static void mt7530_update_port_member(struct mt7530_priv *priv, int port,
        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(struct mt7530_priv *priv, int port,
                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_switch *ds, int port,
                             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_switch *ds, int port,
                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;
 }
 

diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
index 2ea4e24628c6a2da1e03e202a6a1ca0eec50b0b6..28592123070bb2a26e752070b870048f544e4063 100644 (file)
--- 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;