[PATCH net-next v2 5/6] net: dsa: qca: ar9331: add bridge support
From: Oleksij Rempel <o.rempel@pengutronix.de>
Date: 2021-07-02 10:18:43
Also in:
linux-mips, lkml
Subsystem:
networking drivers, networking [dsa], the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Vladimir Oltean, Linus Torvalds
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 2abec323ef14..66456752a436 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>
@@ -1095,6 +1096,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; + int port_mask = BIT(dsa_to_port(ds, port)->cpu_dp->index); + 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; + + 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,
@@ -1111,6 +1162,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