From: Vladimir Oltean <olteanv@gmail.com>
To: DENG Qingfang <dqfext@gmail.com>
Cc: Sean Wang <sean.wang@mediatek.com>,
Landen Chao <Landen.Chao@mediatek.com>,
Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Russell King <linux@armlinux.org.uk>,
"open list:MEDIATEK SWITCH DRIVER" <netdev@vger.kernel.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-arm-kernel@lists.infradead.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@lists.infradead.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH net-next] net: dsa: mt7530: manually set up VLAN ID 0
Date: Tue, 24 Aug 2021 19:57:42 +0300 [thread overview]
Message-ID: <20210824165742.xvkb3ke7boryfoj4@skbuf> (raw)
In-Reply-To: <20210824165253.1691315-1-dqfext@gmail.com>
On Wed, Aug 25, 2021 at 12:52:52AM +0800, DENG Qingfang wrote:
> The driver was relying on dsa_slave_vlan_rx_add_vid to add VLAN ID 0. After
> the blamed commit, VLAN ID 0 won't be set up anymore, breaking software
> bridging fallback on VLAN-unaware bridges.
>
> Manually set up VLAN ID 0 to fix this.
>
> Fixes: 06cfb2df7eb0 ("net: dsa: don't advertise 'rx-vlan-filter' when not needed")
> Signed-off-by: DENG Qingfang <dqfext@gmail.com>
> ---
I understand that this is how you noticed the issue, but please remember
that one can always compile a kernel with CONFIG_VLAN_8021Q=n. So the
issue predates my patch by much longer. You might reconsider the Fixes:
tag in light of this, maybe the patch needs to be sent to stable.
> drivers/net/dsa/mt7530.c | 25 +++++++++++++++++++++++++
> drivers/net/dsa/mt7530.h | 2 ++
> 2 files changed, 27 insertions(+)
>
> diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
> index d757d9dcba51..d0cba2d1cd68 100644
> --- a/drivers/net/dsa/mt7530.c
> +++ b/drivers/net/dsa/mt7530.c
> @@ -1599,6 +1599,21 @@ mt7530_hw_vlan_update(struct mt7530_priv *priv, u16 vid,
> mt7530_vlan_cmd(priv, MT7530_VTCR_WR_VID, vid);
> }
>
> +static int
> +mt7530_setup_vlan0(struct mt7530_priv *priv)
> +{
> + u32 val;
> +
> + /* Validate the entry with independent learning, keep the original
> + * ingress tag attribute.
> + */
> + val = IVL_MAC | EG_CON | PORT_MEM(MT7530_ALL_MEMBERS) | FID(FID_BRIDGED) |
FID_BRIDGED?
> + VLAN_VALID;
> + mt7530_write(priv, MT7530_VAWD1, val);
> +
> + return mt7530_vlan_cmd(priv, MT7530_VTCR_WR_VID, 0);
> +}
> +
> static int
> mt7530_port_vlan_add(struct dsa_switch *ds, int port,
> const struct switchdev_obj_port_vlan *vlan,
> @@ -2174,6 +2189,11 @@ mt7530_setup(struct dsa_switch *ds)
> PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
> }
>
> + /* Setup VLAN ID 0 for VLAN-unaware bridges */
> + ret = mt7530_setup_vlan0(priv);
> + if (ret)
> + return ret;
> +
> /* Setup port 5 */
> priv->p5_intf_sel = P5_DISABLED;
> interface = PHY_INTERFACE_MODE_NA;
> @@ -2346,6 +2366,11 @@ mt7531_setup(struct dsa_switch *ds)
> PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
> }
>
> + /* Setup VLAN ID 0 for VLAN-unaware bridges */
> + ret = mt7530_setup_vlan0(priv);
> + if (ret)
> + return ret;
> +
> ds->assisted_learning_on_cpu_port = true;
> ds->mtu_enforcement_ingress = true;
>
> diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
> index fe4cd2ac26d0..91508e2feef9 100644
> --- a/drivers/net/dsa/mt7530.h
> +++ b/drivers/net/dsa/mt7530.h
> @@ -145,6 +145,8 @@ enum mt7530_vlan_cmd {
> #define PORT_STAG BIT(31)
> /* Independent VLAN Learning */
> #define IVL_MAC BIT(30)
> +/* Egress Tag Consistent */
> +#define EG_CON BIT(29)
> /* Per VLAN Egress Tag Control */
> #define VTAG_EN BIT(28)
> /* VLAN Member Control */
> --
> 2.25.1
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2021-08-24 16:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 16:52 [PATCH net-next] net: dsa: mt7530: manually set up VLAN ID 0 DENG Qingfang
2021-08-24 16:57 ` Vladimir Oltean [this message]
2021-08-24 17:16 ` Vladimir Oltean
2021-08-24 17:32 ` DENG Qingfang
2021-08-24 17:37 ` Vladimir Oltean
2021-08-25 3:55 ` DENG Qingfang
2021-08-24 19:11 ` Florian Fainelli
2021-08-25 10:20 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210824165742.xvkb3ke7boryfoj4@skbuf \
--to=olteanv@gmail.com \
--cc=Landen.Chao@mediatek.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=dqfext@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=matthias.bgg@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=sean.wang@mediatek.com \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).