net: dsa: felix: send VLANs on CPU port as egress-tagged
Subsystems (4)
Vladimir Oltean
maintainerPATCH 1/1 net: dsa: felix: send VLANs on CPU port as egress-tagged
From: Vladimir Oltean <[email protected]>
As explained in other commits before (b9cd75e66895 and 87b0f983f66f), ocelot switches have a single egress-untagged VLAN per port, and the driver would deny adding a second one while an egress-untagged VLAN already exists.
But on the CPU port (where the VLAN configuration is implicit, because there is no net device for the bridge to control), the DSA core attempts to add a VLAN using the same flags as were used for the front-panel port. This would make adding any untagged VLAN fail due to the CPU port rejecting the configuration:
bridge vlan add dev swp0 vid 100 pvid untagged
[ 1865.854253] mscc_felix 0000:00:00.5: Port already has a native VLAN: 1 [ 1865.860824] mscc_felix 0000:00:00.5: Failed to add VLAN 100 to port 5: -16
(note that port 5 is the CPU port and not the front-panel swp0).
So this hardware will send all VLANs as tagged towards the CPU.
--- drivers/net/dsa/ocelot/felix.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/dsa/ocelot/felix.c +6 -2
@@ -103,13 +103,17 @@ static void felix_vlan_add(struct dsa_switch *ds, int port, const struct switchdev_obj_port_vlan *vlan) {struct ocelot *ocelot = ds->priv; +u16 flags = vlan->flags;u16 vid;int err; +if (dsa_is_cpu_port (ds, port)) + flags &= ~BRIDGE_VLAN_INFO_UNTAGGED ; +for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) { err =ocelot_vlan_add (ocelot, port, vid, - vlan->flags &BRIDGE_VLAN_INFO_PVID , - vlan->flags &BRIDGE_VLAN_INFO_UNTAGGED ); + flags &BRIDGE_VLAN_INFO_PVID , + flags &BRIDGE_VLAN_INFO_UNTAGGED );if (err) {dev_err (ds->dev,"Failed to add VLAN %d to port %d: %d\n" , vid, port, err);
Signature · 1 line
2.25.1
Quoted 17 lines · Vladimir Oltean
From: Vladimir Oltean <[email protected]>
As explained in other commits before (
b9cd75e66895and87b0f983f66f), ocelot switches have a single egress-untagged VLAN per port, and the driver would deny adding a second one while an egress-untagged VLAN already exists.But on the CPU port (where the VLAN configuration is implicit, because there is no net device for the bridge to control), the DSA core attempts to add a VLAN using the same flags as were used for the front-panel port. This would make adding any untagged VLAN fail due to the CPU port rejecting the configuration:
bridge vlan add dev swp0 vid 100 pvid untagged
[ 1865.854253] mscc_felix 0000:00:00.5: Port already has a native VLAN: 1 [ 1865.860824] mscc_felix 0000:00:00.5: Failed to add VLAN 100 to port 5: -16
Quoted 6 lines
(note that port 5 is the CPU port and not the front-panel swp0).
So this hardware will send all VLANs as tagged towards the CPU.
Fixes 56051948773e ("net: dsa: ocelot: add driver for Felix switch family")Signed-off-by Vladimir Oltean <[email protected]>
Signature · 1 line
Florian
David Miller
maintainerFrom: Vladimir Oltean <[email protected]>
Date: Wed, 27 May 2020 19:48:03 +0300
Quoted 17 lines
From: Vladimir Oltean <[email protected]>
As explained in other commits before (
b9cd75e66895and87b0f983f66f), ocelot switches have a single egress-untagged VLAN per port, and the driver would deny adding a second one while an egress-untagged VLAN already exists.But on the CPU port (where the VLAN configuration is implicit, because there is no net device for the bridge to control), the DSA core attempts to add a VLAN using the same flags as were used for the front-panel port. This would make adding any untagged VLAN fail due to the CPU port rejecting the configuration:
bridge vlan add dev swp0 vid 100 pvid untagged
[ 1865.854253] mscc_felix 0000:00:00.5: Port already has a native VLAN: 1 [ 1865.860824] mscc_felix 0000:00:00.5: Failed to add VLAN 100 to port 5: -16
Quoted 6 lines
(note that port 5 is the CPU port and not the front-panel swp0).
So this hardware will send all VLANs as tagged towards the CPU.
Fixes 56051948773e ("net: dsa: ocelot: add driver for Felix switch family")Signed-off-by Vladimir Oltean <[email protected]>
Applied and queued up for -stable, thanks.