* [PATCH net-next v2] net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode
@ 2020-04-14 6:34 DENG Qingfang
2020-04-15 19:36 ` Florian Fainelli
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: DENG Qingfang @ 2020-04-14 6:34 UTC (permalink / raw)
To: netdev
Cc: Sean Wang, Andrew Lunn, Vivien Didelot, linux-mediatek,
John Crispin, Stijn Segers, Chuanhong Guo, riddlariddla,
René van Dorst, Szabolcs Hubai, CHEN Minqiang, Paul Fertser
In VLAN-unaware mode, the Egress Tag (EG_TAG) field in Port VLAN
Control register must be set to Consistent to let tagged frames pass
through as is, otherwise their tags will be stripped.
Fixes: 83163f7dca56 ("net: dsa: mediatek: add VLAN support for MT7530")
Signed-off-by: DENG Qingfang <dqfext@gmail.com>
---
Changes since v1:
- Fix build error
---
drivers/net/dsa/mt7530.c | 18 ++++++++++++------
drivers/net/dsa/mt7530.h | 7 +++++++
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 2d0d91db0ddb..951a65ac7f73 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -846,8 +846,9 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port)
*/
mt7530_rmw(priv, MT7530_PCR_P(port), PCR_PORT_VLAN_MASK,
MT7530_PORT_MATRIX_MODE);
- mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK,
- VLAN_ATTR(MT7530_VLAN_TRANSPARENT));
+ mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK | PVC_EG_TAG_MASK,
+ VLAN_ATTR(MT7530_VLAN_TRANSPARENT) |
+ PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
for (i = 0; i < MT7530_NUM_PORTS; i++) {
if (dsa_is_user_port(ds, i) &&
@@ -863,8 +864,8 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port)
if (all_user_ports_removed) {
mt7530_write(priv, MT7530_PCR_P(MT7530_CPU_PORT),
PCR_MATRIX(dsa_user_ports(priv->ds)));
- mt7530_write(priv, MT7530_PVC_P(MT7530_CPU_PORT),
- PORT_SPEC_TAG);
+ mt7530_write(priv, MT7530_PVC_P(MT7530_CPU_PORT), PORT_SPEC_TAG
+ | PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
}
}
@@ -890,8 +891,9 @@ mt7530_port_set_vlan_aware(struct dsa_switch *ds, int port)
/* Set the port as a user port which is to be able to recognize VID
* from incoming packets before fetching entry within the VLAN table.
*/
- mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK,
- VLAN_ATTR(MT7530_VLAN_USER));
+ mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK | PVC_EG_TAG_MASK,
+ VLAN_ATTR(MT7530_VLAN_USER) |
+ PVC_EG_TAG(MT7530_VLAN_EG_DISABLED));
}
static void
@@ -1380,6 +1382,10 @@ mt7530_setup(struct dsa_switch *ds)
mt7530_cpu_port_enable(priv, i);
else
mt7530_port_disable(ds, i);
+
+ /* Enable consistent egress tag */
+ mt7530_rmw(priv, MT7530_PVC_P(i), PVC_EG_TAG_MASK,
+ PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
}
/* Setup port 5 */
diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
index ef9b52f3152b..2528232d3325 100644
--- a/drivers/net/dsa/mt7530.h
+++ b/drivers/net/dsa/mt7530.h
@@ -172,9 +172,16 @@ enum mt7530_port_mode {
/* Register for port vlan control */
#define MT7530_PVC_P(x) (0x2010 + ((x) * 0x100))
#define PORT_SPEC_TAG BIT(5)
+#define PVC_EG_TAG(x) (((x) & 0x7) << 8)
+#define PVC_EG_TAG_MASK PVC_EG_TAG(7)
#define VLAN_ATTR(x) (((x) & 0x3) << 6)
#define VLAN_ATTR_MASK VLAN_ATTR(3)
+enum mt7530_vlan_port_eg_tag {
+ MT7530_VLAN_EG_DISABLED = 0,
+ MT7530_VLAN_EG_CONSISTENT = 1,
+};
+
enum mt7530_vlan_port_attr {
MT7530_VLAN_USER = 0,
MT7530_VLAN_TRANSPARENT = 3,
--
2.26.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next v2] net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode
2020-04-14 6:34 [PATCH net-next v2] net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode DENG Qingfang
@ 2020-04-15 19:36 ` Florian Fainelli
2020-04-16 6:10 ` René van Dorst
2020-04-16 20:32 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2020-04-15 19:36 UTC (permalink / raw)
To: DENG Qingfang, netdev
Cc: Sean Wang, Andrew Lunn, Vivien Didelot, linux-mediatek,
John Crispin, Stijn Segers, Chuanhong Guo, riddlariddla,
René van Dorst, Szabolcs Hubai, CHEN Minqiang, Paul Fertser
On 4/13/2020 11:34 PM, DENG Qingfang wrote:
> In VLAN-unaware mode, the Egress Tag (EG_TAG) field in Port VLAN
> Control register must be set to Consistent to let tagged frames pass
> through as is, otherwise their tags will be stripped.
>
> Fixes: 83163f7dca56 ("net: dsa: mediatek: add VLAN support for MT7530")
> Signed-off-by: DENG Qingfang <dqfext@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next v2] net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode
2020-04-14 6:34 [PATCH net-next v2] net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode DENG Qingfang
2020-04-15 19:36 ` Florian Fainelli
@ 2020-04-16 6:10 ` René van Dorst
2020-04-16 20:32 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: René van Dorst @ 2020-04-16 6:10 UTC (permalink / raw)
To: DENG Qingfang
Cc: netdev, Sean Wang, Andrew Lunn, Vivien Didelot, linux-mediatek,
John Crispin, Stijn Segers, Chuanhong Guo, riddlariddla,
Szabolcs Hubai, CHEN Minqiang, Paul Fertser
Hi Qingfang,
Quoting DENG Qingfang <dqfext@gmail.com>:
> In VLAN-unaware mode, the Egress Tag (EG_TAG) field in Port VLAN
> Control register must be set to Consistent to let tagged frames pass
> through as is, otherwise their tags will be stripped.
Thanks for fixing the vlan issues!
Tested-by: René van Dorst <opensource@vdorst.com>
Greats,
René
>
> Fixes: 83163f7dca56 ("net: dsa: mediatek: add VLAN support for MT7530")
> Signed-off-by: DENG Qingfang <dqfext@gmail.com>
> ---
> Changes since v1:
> - Fix build error
>
> ---
> drivers/net/dsa/mt7530.c | 18 ++++++++++++------
> drivers/net/dsa/mt7530.h | 7 +++++++
> 2 files changed, 19 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
> index 2d0d91db0ddb..951a65ac7f73 100644
> --- a/drivers/net/dsa/mt7530.c
> +++ b/drivers/net/dsa/mt7530.c
> @@ -846,8 +846,9 @@ mt7530_port_set_vlan_unaware(struct dsa_switch
> *ds, int port)
> */
> mt7530_rmw(priv, MT7530_PCR_P(port), PCR_PORT_VLAN_MASK,
> MT7530_PORT_MATRIX_MODE);
> - mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK,
> - VLAN_ATTR(MT7530_VLAN_TRANSPARENT));
> + mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK | PVC_EG_TAG_MASK,
> + VLAN_ATTR(MT7530_VLAN_TRANSPARENT) |
> + PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
>
> for (i = 0; i < MT7530_NUM_PORTS; i++) {
> if (dsa_is_user_port(ds, i) &&
> @@ -863,8 +864,8 @@ mt7530_port_set_vlan_unaware(struct dsa_switch
> *ds, int port)
> if (all_user_ports_removed) {
> mt7530_write(priv, MT7530_PCR_P(MT7530_CPU_PORT),
> PCR_MATRIX(dsa_user_ports(priv->ds)));
> - mt7530_write(priv, MT7530_PVC_P(MT7530_CPU_PORT),
> - PORT_SPEC_TAG);
> + mt7530_write(priv, MT7530_PVC_P(MT7530_CPU_PORT), PORT_SPEC_TAG
> + | PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
> }
> }
>
> @@ -890,8 +891,9 @@ mt7530_port_set_vlan_aware(struct dsa_switch
> *ds, int port)
> /* Set the port as a user port which is to be able to recognize VID
> * from incoming packets before fetching entry within the VLAN table.
> */
> - mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK,
> - VLAN_ATTR(MT7530_VLAN_USER));
> + mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK | PVC_EG_TAG_MASK,
> + VLAN_ATTR(MT7530_VLAN_USER) |
> + PVC_EG_TAG(MT7530_VLAN_EG_DISABLED));
> }
>
> static void
> @@ -1380,6 +1382,10 @@ mt7530_setup(struct dsa_switch *ds)
> mt7530_cpu_port_enable(priv, i);
> else
> mt7530_port_disable(ds, i);
> +
> + /* Enable consistent egress tag */
> + mt7530_rmw(priv, MT7530_PVC_P(i), PVC_EG_TAG_MASK,
> + PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
> }
>
> /* Setup port 5 */
> diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
> index ef9b52f3152b..2528232d3325 100644
> --- a/drivers/net/dsa/mt7530.h
> +++ b/drivers/net/dsa/mt7530.h
> @@ -172,9 +172,16 @@ enum mt7530_port_mode {
> /* Register for port vlan control */
> #define MT7530_PVC_P(x) (0x2010 + ((x) * 0x100))
> #define PORT_SPEC_TAG BIT(5)
> +#define PVC_EG_TAG(x) (((x) & 0x7) << 8)
> +#define PVC_EG_TAG_MASK PVC_EG_TAG(7)
> #define VLAN_ATTR(x) (((x) & 0x3) << 6)
> #define VLAN_ATTR_MASK VLAN_ATTR(3)
>
> +enum mt7530_vlan_port_eg_tag {
> + MT7530_VLAN_EG_DISABLED = 0,
> + MT7530_VLAN_EG_CONSISTENT = 1,
> +};
> +
> enum mt7530_vlan_port_attr {
> MT7530_VLAN_USER = 0,
> MT7530_VLAN_TRANSPARENT = 3,
> --
> 2.26.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next v2] net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode
2020-04-14 6:34 [PATCH net-next v2] net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode DENG Qingfang
2020-04-15 19:36 ` Florian Fainelli
2020-04-16 6:10 ` René van Dorst
@ 2020-04-16 20:32 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-04-16 20:32 UTC (permalink / raw)
To: dqfext
Cc: netdev, sean.wang, andrew, vivien.didelot, linux-mediatek, john,
foss, gch981213, riddlariddla, opensource, szab.hu, ptpt52,
fercerpav
From: DENG Qingfang <dqfext@gmail.com>
Date: Tue, 14 Apr 2020 14:34:08 +0800
> In VLAN-unaware mode, the Egress Tag (EG_TAG) field in Port VLAN
> Control register must be set to Consistent to let tagged frames pass
> through as is, otherwise their tags will be stripped.
>
> Fixes: 83163f7dca56 ("net: dsa: mediatek: add VLAN support for MT7530")
> Signed-off-by: DENG Qingfang <dqfext@gmail.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-16 20:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-14 6:34 [PATCH net-next v2] net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode DENG Qingfang
2020-04-15 19:36 ` Florian Fainelli
2020-04-16 6:10 ` René van Dorst
2020-04-16 20:32 ` David Miller
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).