git.openwrt.org Git - openwrt/staging/xback.git/blob

   1 From 422b64025ec10981c48f9367311846bf4bd38042 Mon Sep 17 00:00:00 2001
   2 Message-ID: <422b64025ec10981c48f9367311846bf4bd38042.1728674648.git.mschiffer@universe-factory.net>
   3 In-Reply-To: <e85d3e6fea05c8ae21a40809a3c6b7adc97411c7.1728674648.git.mschiffer@universe-factory.net>
   4 References: <e85d3e6fea05c8ae21a40809a3c6b7adc97411c7.1728674648.git.mschiffer@universe-factory.net>
   5 From: Matthias Schiffer <mschiffer@universe-factory.net>
   6 Date: Thu, 20 Jun 2024 19:25:50 +0200
   7 Subject: [PATCH] net: dsa: qca8k: add support for bridge port isolation
   8
   9 Remove a pair of ports from the port matrix when both ports have the
  10 isolated flag set.
  11
  12 Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
  13 Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
  14 Signed-off-by: David S. Miller <davem@davemloft.net>
  15 ---
  16  drivers/net/dsa/qca/qca8k-common.c | 22 ++++++++++++++++++++--
  17  drivers/net/dsa/qca/qca8k.h        |  1 +
  18  2 files changed, 21 insertions(+), 2 deletions(-)
  19
  20 --- a/drivers/net/dsa/qca/qca8k-common.c
  21 +++ b/drivers/net/dsa/qca/qca8k-common.c
  22 @@ -619,6 +619,7 @@ static int qca8k_update_port_member(stru
  23                                     const struct net_device *bridge_dev,
  24                                     bool join)
  25  {
  26 +       bool isolated = !!(priv->port_isolated_map & BIT(port)), other_isolated;
  27         struct dsa_port *dp = dsa_to_port(priv->ds, port), *other_dp;
  28         u32 port_mask = BIT(dp->cpu_dp->index);
  29         int i, ret;
  30 @@ -633,10 +634,12 @@ static int qca8k_update_port_member(stru
  31                 if (!dsa_port_offloads_bridge_dev(other_dp, bridge_dev))
  32                         continue;
  33
  34 +               other_isolated = !!(priv->port_isolated_map & BIT(i));
  35 +
  36                 /* Add/remove this port to/from the portvlan mask of the other
  37                  * ports in the bridge
  38                  */
  39 -               if (join) {
  40 +               if (join && !(isolated && other_isolated)) {
  41                         port_mask |= BIT(i);
  42                         ret = regmap_set_bits(priv->regmap,
  43                                               QCA8K_PORT_LOOKUP_CTRL(i),
  44 @@ -662,7 +665,7 @@ int qca8k_port_pre_bridge_flags(struct d
  45                                 struct switchdev_brport_flags flags,
  46                                 struct netlink_ext_ack *extack)
  47  {
  48 -       if (flags.mask & ~BR_LEARNING)
  49 +       if (flags.mask & ~(BR_LEARNING | BR_ISOLATED))
  50                 return -EINVAL;
  51
  52         return 0;
  53 @@ -672,6 +675,7 @@ int qca8k_port_bridge_flags(struct dsa_s
  54                             struct switchdev_brport_flags flags,
  55                             struct netlink_ext_ack *extack)
  56  {
  57 +       struct qca8k_priv *priv = ds->priv;
  58         int ret;
  59
  60         if (flags.mask & BR_LEARNING) {
  61 @@ -680,6 +684,20 @@ int qca8k_port_bridge_flags(struct dsa_s
  62                 if (ret)
  63                         return ret;
  64         }
  65 +
  66 +       if (flags.mask & BR_ISOLATED) {
  67 +               struct dsa_port *dp = dsa_to_port(ds, port);
  68 +               struct net_device *bridge_dev = dsa_port_bridge_dev_get(dp);
  69 +
  70 +               if (flags.val & BR_ISOLATED)
  71 +                       priv->port_isolated_map |= BIT(port);
  72 +               else
  73 +                       priv->port_isolated_map &= ~BIT(port);
  74 +
  75 +               ret = qca8k_update_port_member(priv, port, bridge_dev, true);
  76 +               if (ret)
  77 +                       return ret;
  78 +       }
  79
  80         return 0;
  81  }
  82 --- a/drivers/net/dsa/qca/qca8k.h
  83 +++ b/drivers/net/dsa/qca/qca8k.h
  84 @@ -451,6 +451,7 @@ struct qca8k_priv {
  85          * Bit 1: port enabled. Bit 0: port disabled.
  86          */
  87         u8 port_enabled_map;
  88 +       u8 port_isolated_map;
  89         struct qca8k_ports_config ports_config;
  90         struct regmap *regmap;
  91         struct mii_bus *bus;