Re: [PATCH net-next v3 5/6] net: dsa: qca: ar9331: add bridge support
flat view
From: Vladimir Oltean <olteanv@gmail.com>
Date: 2021-08-02 14:55:36
Also in:
linux-mips, lkml
On Mon, Aug 02, 2021 at 03:10:36PM +0200, Oleksij Rempel wrote:
quoted hunk ↗ jump to hunk
This switch is providing forwarding matrix, with it we can configure individual bridges. Potentially we can configure more than one not VLAN based bridge on this HW. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/dsa/qca/ar9331.c | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)diff --git a/drivers/net/dsa/qca/ar9331.c b/drivers/net/dsa/qca/ar9331.c index d726d2f223ea..a0324fed2136 100644 --- a/drivers/net/dsa/qca/ar9331.c +++ b/drivers/net/dsa/qca/ar9331.c@@ -40,6 +40,7 @@ */ #include <linux/bitfield.h> +#include <linux/if_bridge.h> #include <linux/module.h> #include <linux/of_irq.h> #include <linux/of_mdio.h>@@ -1093,6 +1094,56 @@ static int ar9331_sw_set_ageing_time(struct dsa_switch *ds, val); } +static int ar9331_sw_port_bridge_mod(struct dsa_switch *ds, int port, + struct net_device *br, bool join) +{ + struct ar9331_sw_priv *priv = (struct ar9331_sw_priv *)ds->priv; + struct regmap *regmap = priv->regmap;
Reverse Christmas tree notation..
+ int port_mask = BIT(dsa_to_port(ds, port)->cpu_dp->index);
Could you use dsa_upstream_port(ds, port) instead of raw access to cpu_dp? Or alternatively, you can add another condition in your "for" loop, for dsa_is_cpu_port(ds, port) => port_mask |= BIT(i);
quoted hunk ↗ jump to hunk
+ int i, ret; + u32 val; + + for (i = 0; i < ds->num_ports; i++) { + if (dsa_to_port(ds, i)->bridge_dev != br) + continue; + + if (!dsa_is_user_port(ds, port)) + continue;
Only user ports can have a ->bridge_dev pointer populated in the first place. Also, did you mean dsa_is_user_port(ds, i)? The "port" variable is an invariant as far as this loop is concerned.
quoted hunk ↗ jump to hunk
+ + val = FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID_MEMBER, BIT(port)); + ret = regmap_set_bits(regmap, AR9331_SW_REG_PORT_VLAN(i), val); + if (ret) + goto error; + + if (join && i != port) + port_mask |= BIT(i); + } + + val = FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID_MEMBER, port_mask); + ret = regmap_update_bits(regmap, AR9331_SW_REG_PORT_VLAN(port), + AR9331_SW_PORT_VLAN_PORT_VID_MEMBER, val); + if (ret) + goto error; + + return 0; +error: + dev_err(priv->dev, "%s: error: %i\n", __func__, ret); + + return ret; +} + +static int ar9331_sw_port_bridge_join(struct dsa_switch *ds, int port, + struct net_device *br) +{ + return ar9331_sw_port_bridge_mod(ds, port, br, true); +} + +static void ar9331_sw_port_bridge_leave(struct dsa_switch *ds, int port, + struct net_device *br) +{ + ar9331_sw_port_bridge_mod(ds, port, br, false); +} + static const struct dsa_switch_ops ar9331_sw_ops = { .get_tag_protocol = ar9331_sw_get_tag_protocol, .setup = ar9331_sw_setup,@@ -1109,6 +1160,8 @@ static const struct dsa_switch_ops ar9331_sw_ops = { .port_mdb_add = ar9331_sw_port_mdb_add, .port_mdb_del = ar9331_sw_port_mdb_del, .set_ageing_time = ar9331_sw_set_ageing_time, + .port_bridge_join = ar9331_sw_port_bridge_join, + .port_bridge_leave = ar9331_sw_port_bridge_leave, }; static irqreturn_t ar9331_sw_irq(int irq, void *data)-- 2.30.2