net: dsa: mt7530: preserve VLAN tags on trapped link-local frames

The BPC, RGAC1 and RGAC2 registers control the handling of link-local
frames with reserved MAC DAs (01:80:C2:00:00:0x). These frames are
correctly trapped to the CPU port, but the egress VLAN tag attribute was
set to MT7530_VLAN_EG_UNTAGGED which causes the switch to strip any
VLAN tags from trapped frames before they reach the CPU.

This causes VLAN-tagged link-local frames (STP BPDUs, LLDP, PTP Peer
Delay Requests) to arrive at the CPU without their VLAN tag, so they
are delivered to the base network interface instead of the VLAN
sub-interface. The DSA local_termination selftest confirms this: all
link-local protocol tests on VLAN upper interfaces fail.

Set the EG_TAG attribute to MT7530_VLAN_EG_DISABLED (system default)
so that the switch does not modify VLAN tags in trapped frames. This
way VLAN-tagged frames retain their original tag and are delivered to
the correct VLAN sub-interface, matching the behavior of non-trapped
frames which pass through without VLAN tag modification.

Fixes: 69ddba9d170b ("net: dsa: mt7530: fix handling of all link-local frames")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Acked-by: Chester A. Unal <chester.a.unal@arinc9.com>
Link: https://patch.msgid.link/891e0cd34db2a5fe20ceb73283a81fb5f71427ca.1778766629.git.daniel@makrotopia.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index cd311dfd3600d24ff9dd531f494351c571a70ae2..4f657ef6aa6509fe0fa924830432cdf1d6747c2d 100644 (file)
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1300,37 +1300,40 @@ static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)
 static void
 mt753x_trap_frames(struct mt7530_priv *priv)
 {
-       /* Trap 802.1X PAE frames and BPDUs to the CPU port(s) and egress them
-        * VLAN-untagged.
+       /* Trap 802.1X PAE frames and BPDUs to the CPU port(s) and egress
+        * them with the EG_TAG attribute set to disabled (system default)
+        * so that any VLAN tags in the frame are not modified by the
+        * switch egress VLAN tag processing. This preserves VLAN tags
+        * for reception on VLAN sub-interfaces.
         */
        mt7530_rmw(priv, MT753X_BPC,
                   PAE_BPDU_FR | PAE_EG_TAG_MASK | PAE_PORT_FW_MASK |
                           BPDU_EG_TAG_MASK | BPDU_PORT_FW_MASK,
-                  PAE_BPDU_FR | PAE_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |
+                  PAE_BPDU_FR | PAE_EG_TAG(MT7530_VLAN_EG_DISABLED) |
                           PAE_PORT_FW(TO_CPU_FW_CPU_ONLY) |
-                          BPDU_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |
+                          BPDU_EG_TAG(MT7530_VLAN_EG_DISABLED) |
                           TO_CPU_FW_CPU_ONLY);
 
-       /* Trap frames with :01 and :02 MAC DAs to the CPU port(s) and egress
-        * them VLAN-untagged.
+       /* Trap frames with :01 and :02 MAC DAs to the CPU port(s) and
+        * egress them with EG_TAG disabled.
         */
        mt7530_rmw(priv, MT753X_RGAC1,
                   R02_BPDU_FR | R02_EG_TAG_MASK | R02_PORT_FW_MASK |
                           R01_BPDU_FR | R01_EG_TAG_MASK | R01_PORT_FW_MASK,
-                  R02_BPDU_FR | R02_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |
+                  R02_BPDU_FR | R02_EG_TAG(MT7530_VLAN_EG_DISABLED) |
                           R02_PORT_FW(TO_CPU_FW_CPU_ONLY) | R01_BPDU_FR |
-                          R01_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |
+                          R01_EG_TAG(MT7530_VLAN_EG_DISABLED) |
                           TO_CPU_FW_CPU_ONLY);
 
-       /* Trap frames with :03 and :0E MAC DAs to the CPU port(s) and egress
-        * them VLAN-untagged.
+       /* Trap frames with :03 and :0E MAC DAs to the CPU port(s) and
+        * egress them with EG_TAG disabled.
         */
        mt7530_rmw(priv, MT753X_RGAC2,
                   R0E_BPDU_FR | R0E_EG_TAG_MASK | R0E_PORT_FW_MASK |
                           R03_BPDU_FR | R03_EG_TAG_MASK | R03_PORT_FW_MASK,
-                  R0E_BPDU_FR | R0E_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |
+                  R0E_BPDU_FR | R0E_EG_TAG(MT7530_VLAN_EG_DISABLED) |
                           R0E_PORT_FW(TO_CPU_FW_CPU_ONLY) | R03_BPDU_FR |
-                          R03_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |
+                          R03_EG_TAG(MT7530_VLAN_EG_DISABLED) |
                           TO_CPU_FW_CPU_ONLY);
 }