Re: [PATCH net-next v3 2/2] net: dsa: qca8k: Add 802.1q VLAN support

Vladimir Oltean
2020-08-02T13:21:18Z

On Sat, Aug 01, 2020 at 06:06:46PM +0100, Jonathan McDowell wrote:
> This adds full 802.1q VLAN support to the qca8k, allowing the use of
> vlan_filtering and more complicated bridging setups than allowed by
> basic port VLAN support.
>
> Tested with a number of untagged ports with separate VLANs and then a
> trunk port with all the VLANs tagged on it.
>
> v3:
> - Pull QCA8K_PORT_VID_DEF changes into separate cleanup patch
> - Reverse Christmas tree notation for variable definitions
> - Use untagged instead of tagged for consistency
> v2:
> - Return sensible errnos on failure rather than -1 (rmk)
> - Style cleanups based on Florian's feedback
> - Silently allow VLAN 0 as device correctly treats this as no tag
>
> Signed-off-by: Jonathan McDowell <noodles@earth.li>
> ---

My comments have been addressed, thanks.

Acked-by: Vladimir Oltean <olteanv@gmail.com>

> drivers/net/dsa/qca8k.c | 181 ++++++++++++++++++++++++++++++++++++++++
> drivers/net/dsa/qca8k.h | 27 ++++++
> 2 files changed, 208 insertions(+)
>
> diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
> index 3ebc4da63074..f1e484477e35 100644
> --- a/drivers/net/dsa/qca8k.c
> +++ b/drivers/net/dsa/qca8k.c
> @@ -408,6 +408,112 @@ qca8k_fdb_flush(struct qca8k_priv *priv)
> mutex_unlock(&priv->reg_mutex);
> }
>
> +static int
> +qca8k_vlan_access(struct qca8k_priv *priv, enum qca8k_vlan_cmd cmd, u16 vid)
> +{
> + u32 reg;
> +
> + /* Set the command and VLAN index */
> + reg = QCA8K_VTU_FUNC1_BUSY;
> + reg |= cmd;
> + reg |= vid << QCA8K_VTU_FUNC1_VID_S;
> +
> + /* Write the function register triggering the table access */
> + qca8k_write(priv, QCA8K_REG_VTU_FUNC1, reg);
> +
> + /* wait for completion */
> + if (qca8k_busy_wait(priv, QCA8K_REG_VTU_FUNC1, QCA8K_VTU_FUNC1_BUSY))
> + return -ETIMEDOUT;
> +
> + /* Check for table full violation when adding an entry */
> + if (cmd == QCA8K_VLAN_LOAD) {
> + reg = qca8k_read(priv, QCA8K_REG_VTU_FUNC1);
> + if (reg & QCA8K_VTU_FUNC1_FULL)
> + return -ENOMEM;
> + }
> +
> + return 0;
> +}
> +
> +static int
> +qca8k_vlan_add(struct qca8k_priv *priv, u8 port, u16 vid, bool untagged)
> +{
> + u32 reg;
> + int ret;
> +
> + /*
> + We do the right thing with VLAN 0 and treat it as untagged while
> + preserving the tag on egress.
> + */
> + if (vid == 0)
> + return 0;
> +
> + mutex_lock(&priv->reg_mutex);
> + ret = qca8k_vlan_access(priv, QCA8K_VLAN_READ, vid);
> + if (ret < 0)
> + goto out;
> +
> + reg = qca8k_read(priv, QCA8K_REG_VTU_FUNC0);
> + reg |= QCA8K_VTU_FUNC0_VALID | QCA8K_VTU_FUNC0_IVL_EN;
> + reg &= ~(QCA8K_VTU_FUNC0_EG_MODE_MASK << QCA8K_VTU_FUNC0_EG_MODE_S(port));
> + if (untagged)
> + reg |= QCA8K_VTU_FUNC0_EG_MODE_UNTAG <<
> + QCA8K_VTU_FUNC0_EG_MODE_S(port);
> + else
> + reg |= QCA8K_VTU_FUNC0_EG_MODE_TAG <<
> + QCA8K_VTU_FUNC0_EG_MODE_S(port);
> +
> + qca8k_write(priv, QCA8K_REG_VTU_FUNC0, reg);
> + ret = qca8k_vlan_access(priv, QCA8K_VLAN_LOAD, vid);
> +
> +out:
> + mutex_unlock(&priv->reg_mutex);
> +
> + return ret;
> +}
> +
> +static int
> +qca8k_vlan_del(struct qca8k_priv *priv, u8 port, u16 vid)
> +{
> + u32 reg, mask;
> + int ret, i;
> + bool del;
> +
> + mutex_lock(&priv->reg_mutex);
> + ret = qca8k_vlan_access(priv, QCA8K_VLAN_READ, vid);
> + if (ret < 0)
> + goto out;
> +
> + reg = qca8k_read(priv, QCA8K_REG_VTU_FUNC0);
> + reg &= ~(3 << QCA8K_VTU_FUNC0_EG_MODE_S(port));
> + reg |= QCA8K_VTU_FUNC0_EG_MODE_NOT <<
> + QCA8K_VTU_FUNC0_EG_MODE_S(port);
> +
> + /* Check if we're the last member to be removed */
> + del = true;
> + for (i = 0; i < QCA8K_NUM_PORTS; i++) {
> + mask = QCA8K_VTU_FUNC0_EG_MODE_NOT;
> + mask <<= QCA8K_VTU_FUNC0_EG_MODE_S(i);
> +
> + if ((reg & mask) != mask) {
> + del = false;
> + break;
> + }
> + }
> +
> + if (del) {
> + ret = qca8k_vlan_access(priv, QCA8K_VLAN_PURGE, vid);
> + } else {
> + qca8k_write(priv, QCA8K_REG_VTU_FUNC0, reg);
> + ret = qca8k_vlan_access(priv, QCA8K_VLAN_LOAD, vid);
> + }
> +
> +out:
> + mutex_unlock(&priv->reg_mutex);
> +
> + return ret;
> +}
> +
> static void
> qca8k_mib_init(struct qca8k_priv *priv)
> {
> @@ -1187,6 +1293,76 @@ qca8k_port_fdb_dump(struct dsa_switch *ds, int port,
> return 0;
> }
>
> +static int
> +qca8k_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering)
> +{
> + struct qca8k_priv *priv = ds->priv;
> +
> + if (vlan_filtering) {
> + qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
> + QCA8K_PORT_LOOKUP_VLAN_MODE,
> + QCA8K_PORT_LOOKUP_VLAN_MODE_SECURE);
> + } else {
> + qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
> + QCA8K_PORT_LOOKUP_VLAN_MODE,
> + QCA8K_PORT_LOOKUP_VLAN_MODE_NONE);
> + }
> +
> + return 0;
> +}
> +
> +static int
> +qca8k_port_vlan_prepare(struct dsa_switch *ds, int port,
> + const struct switchdev_obj_port_vlan *vlan)
> +{
> + return 0;
> +}
> +
> +static void
> +qca8k_port_vlan_add(struct dsa_switch *ds, int port,
> + const struct switchdev_obj_port_vlan *vlan)
> +{
> + bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;
> + bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;
> + struct qca8k_priv *priv = ds->priv;
> + int ret = 0;
> + u16 vid;
> +
> + for (vid = vlan->vid_begin; vid <= vlan->vid_end && !ret; ++vid)
> + ret = qca8k_vlan_add(priv, port, vid, untagged);
> +
> + if (ret)
> + dev_err(priv->dev, "Failed to add VLAN to port %d (%d)", port, ret);
> +
> + if (pvid) {
> + int shift = 16 * (port % 2);
> +
> + qca8k_rmw(priv, QCA8K_EGRESS_VLAN(port),
> + 0xfff << shift,
> + vlan->vid_end << shift);
> + qca8k_write(priv, QCA8K_REG_PORT_VLAN_CTRL0(port),
> + QCA8K_PORT_VLAN_CVID(vlan->vid_end) |
> + QCA8K_PORT_VLAN_SVID(vlan->vid_end));
> + }
> +}
> +
> +static int
> +qca8k_port_vlan_del(struct dsa_switch *ds, int port,
> + const struct switchdev_obj_port_vlan *vlan)
> +{
> + struct qca8k_priv *priv = ds->priv;
> + int ret = 0;
> + u16 vid;
> +
> + for (vid = vlan->vid_begin; vid <= vlan->vid_end && !ret; ++vid)
> + ret = qca8k_vlan_del(priv, port, vid);
> +
> + if (ret)
> + dev_err(priv->dev, "Failed to delete VLAN from port %d (%d)", port, ret);
> +
> + return ret;
> +}
> +
> static enum dsa_tag_protocol
> qca8k_get_tag_protocol(struct dsa_switch *ds, int port,
> enum dsa_tag_protocol mp)
> @@ -1212,6 +1388,10 @@ static const struct dsa_switch_ops qca8k_switch_ops = {
> .port_fdb_add = qca8k_port_fdb_add,
> .port_fdb_del = qca8k_port_fdb_del,
> .port_fdb_dump = qca8k_port_fdb_dump,
> + .port_vlan_filtering = qca8k_port_vlan_filtering,
> + .port_vlan_prepare = qca8k_port_vlan_prepare,
> + .port_vlan_add = qca8k_port_vlan_add,
> + .port_vlan_del = qca8k_port_vlan_del,
> .phylink_validate = qca8k_phylink_validate,
> .phylink_mac_link_state = qca8k_phylink_mac_link_state,
> .phylink_mac_config = qca8k_phylink_mac_config,
> @@ -1262,6 +1442,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
>
> priv->ds->dev = &mdiodev->dev;
> priv->ds->num_ports = QCA8K_NUM_PORTS;
> + priv->ds->configure_vlan_while_not_filtering = true;
> priv->ds->priv = priv;
> priv->ops = qca8k_switch_ops;
> priv->ds->ops = &priv->ops;
> diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
> index 92216a52daa5..7ca4b93e0bb5 100644
> --- a/drivers/net/dsa/qca8k.h
> +++ b/drivers/net/dsa/qca8k.h
> @@ -128,6 +128,19 @@
> #define QCA8K_ATU_FUNC_FULL BIT(12)
> #define QCA8K_ATU_FUNC_PORT_M 0xf
> #define QCA8K_ATU_FUNC_PORT_S 8
> +#define QCA8K_REG_VTU_FUNC0 0x610
> +#define QCA8K_VTU_FUNC0_VALID BIT(20)
> +#define QCA8K_VTU_FUNC0_IVL_EN BIT(19)
> +#define QCA8K_VTU_FUNC0_EG_MODE_S(_i) (4 + (_i) * 2)
> +#define QCA8K_VTU_FUNC0_EG_MODE_MASK 3
> +#define QCA8K_VTU_FUNC0_EG_MODE_UNMOD 0
> +#define QCA8K_VTU_FUNC0_EG_MODE_UNTAG 1
> +#define QCA8K_VTU_FUNC0_EG_MODE_TAG 2
> +#define QCA8K_VTU_FUNC0_EG_MODE_NOT 3
> +#define QCA8K_REG_VTU_FUNC1 0x614
> +#define QCA8K_VTU_FUNC1_BUSY BIT(31)
> +#define QCA8K_VTU_FUNC1_VID_S 16
> +#define QCA8K_VTU_FUNC1_FULL BIT(4)
> #define QCA8K_REG_GLOBAL_FW_CTRL0 0x620
> #define QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN BIT(10)
> #define QCA8K_REG_GLOBAL_FW_CTRL1 0x624
> @@ -137,6 +150,11 @@
> #define QCA8K_GLOBAL_FW_CTRL1_UC_DP_S 0
> #define QCA8K_PORT_LOOKUP_CTRL(_i) (0x660 + (_i) * 0xc)
> #define QCA8K_PORT_LOOKUP_MEMBER GENMASK(6, 0)
> +#define QCA8K_PORT_LOOKUP_VLAN_MODE GENMASK(9, 8)
> +#define QCA8K_PORT_LOOKUP_VLAN_MODE_NONE (0 << 8)
> +#define QCA8K_PORT_LOOKUP_VLAN_MODE_FALLBACK (1 << 8)
> +#define QCA8K_PORT_LOOKUP_VLAN_MODE_CHECK (2 << 8)
> +#define QCA8K_PORT_LOOKUP_VLAN_MODE_SECURE (3 << 8)
> #define QCA8K_PORT_LOOKUP_STATE_MASK GENMASK(18, 16)
> #define QCA8K_PORT_LOOKUP_STATE_DISABLED (0 << 16)
> #define QCA8K_PORT_LOOKUP_STATE_BLOCKING (1 << 16)
> @@ -180,6 +198,15 @@ enum qca8k_fdb_cmd {
> QCA8K_FDB_SEARCH = 7,
> };
>
> +enum qca8k_vlan_cmd {
> + QCA8K_VLAN_FLUSH = 1,
> + QCA8K_VLAN_LOAD = 2,
> + QCA8K_VLAN_PURGE = 3,
> + QCA8K_VLAN_REMOVE_PORT = 4,
> + QCA8K_VLAN_NEXT = 5,
> + QCA8K_VLAN_READ = 6,
> +};
> +
> struct ar8xxx_port_status {
> int enabled;
> };
> --
> 2.20.1
>