net: dsa: b53: Configure VLANs while not filtering
PATCH 1/1 net: dsa: b53: Configure VLANs while not filtering
Update the B53 driver to support VLANs while not filtering. This requires us to enable VLAN globally within the switch upon driver initial configuration (dev->vlan_enabled).
We also need to remove the code that dealt with PVID re-configuration in b53_vlan_filtering() since that function worked under the assumption that it would only be called to make a bridge VLAN filtering, or not filtering, and we would attempt to move the port's PVID accordingly.
Now that VLANs are programmed all the time, even in the case of a non-VLAN filtering bridge, we would be programming a default_pvid for the bridged switch ports.
--- drivers/net/dsa/b53/b53_common.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-)
drivers/net/dsa/b53/b53_common.c +4 -19
@@ -1377,23 +1377,6 @@ EXPORT_SYMBOL(b53_phylink_mac_link_up);int b53_vlan_filtering (struct dsa_switch *ds,int port,bool vlan_filtering) {struct b53_device *dev = ds->priv; -u16 pvid, new_pvid; - -b53_read16 (dev,B53_VLAN_PAGE ,B53_VLAN_PORT_DEF_TAG (port), &pvid); -if (!vlan_filtering) { -/* Filtering is currently enabled, use the default PVID since -* the bridge does not expect tagging anymore -*/ - dev->ports[port].pvid = pvid; - new_pvid =b53_default_pvid (dev); - }else { -/* Filtering is currently disabled, restore the previous PVID */ - new_pvid = dev->ports[port].pvid; - } - -if (pvid != new_pvid) -b53_write16 (dev,B53_VLAN_PAGE ,B53_VLAN_PORT_DEF_TAG (port), - new_pvid);b53_enable_vlan (dev, dev->vlan_enabled, vlan_filtering);
@@ -1444,7 +1427,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port, untagged = true; vl->members |=BIT (port); -if (untagged && !dsa_is_cpu_port (ds, port)) +if (untagged) vl->untag |=BIT (port);else vl->untag &= ~BIT (port);
@@ -1482,7 +1465,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port,if (pvid == vid) pvid =b53_default_pvid (dev); -if (untagged && !dsa_is_cpu_port (ds, port)) +if (untagged) vl->untag &= ~(BIT (port));b53_set_vlan_entry (dev, vid, vl);
@@ -2619,6 +2602,8 @@ struct b53_device *b53_switch_alloc(struct device *base, dev->priv = priv; dev->ops = ops; ds->ops = &b53_switch_ops; + ds->configure_vlan_while_not_filtering = true; + dev->vlan_enabled = ds->configure_vlan_while_not_filtering;mutex_init (&dev->reg_mutex);mutex_init (&dev->stats_mutex);
Signature · 1 line
2.25.1
Quoted 9 lines · Florian Fainelli
Update the B53 driver to support VLANs while not filtering. This requires us to enable VLAN globally within the switch upon driver initial configuration (
dev->vlan_enabled).We also need to remove the code that dealt with PVID re-configuration in
b53_vlan_filtering()since that function worked under the assumption that it would only be called to make a bridge VLAN filtering, or not filtering, and we would attempt to move the port's PVID accordingly.
Quoted 6 lines
Now that VLANs are programmed all the time, even in the case of a non-VLAN filtering bridge, we would be programming a
default_pvidfor the bridged switch ports.Signed-off-by Florian Fainelli <[email protected]>---
Not sure it's worth a lot, but:
Quoted 61 lines
drivers/net/dsa/b53/b53_common.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-)drivers/net/dsa/b53/b53_common.c +4
-20@@ -1377,23 +1377,6 @@ EXPORT_SYMBOL(b53_phylink_mac_link_up);int b53_vlan_filtering (struct dsa_switch *ds,int port,bool vlan_filtering) {struct b53_device *dev = ds->priv; -u16 pvid, new_pvid; - -b53_read16 (dev,B53_VLAN_PAGE ,B53_VLAN_PORT_DEF_TAG (port), &pvid); -if (!vlan_filtering) { -/* Filtering is currently enabled, use the default PVID since -* the bridge does not expect tagging anymore -*/ - dev->ports[port].pvid = pvid; - new_pvid =b53_default_pvid (dev); - }else { -/* Filtering is currently disabled, restore the previous PVID */ - new_pvid = dev->ports[port].pvid; - } - -if (pvid != new_pvid) -b53_write16 (dev,B53_VLAN_PAGE ,B53_VLAN_PORT_DEF_TAG (port), - new_pvid);b53_enable_vlan (dev, dev->vlan_enabled, vlan_filtering);@@ -1444,7 +1427,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port, untagged = true; vl->members |=BIT (port); -if (untagged && !dsa_is_cpu_port (ds, port)) +if (untagged) vl->untag |=BIT (port);else vl->untag &= ~BIT (port);@@ -1482,7 +1465,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port,if (pvid == vid) pvid =b53_default_pvid (dev); -if (untagged && !dsa_is_cpu_port (ds, port)) +if (untagged) vl->untag &= ~(BIT (port));b53_set_vlan_entry (dev, vid, vl);@@ -2619,6 +2602,8 @@ struct b53_device *b53_switch_alloc(struct device *base, dev->priv = priv; dev->ops = ops; ds->ops = &b53_switch_ops; + ds->configure_vlan_while_not_filtering = true; + dev->vlan_enabled = ds->configure_vlan_while_not_filtering;mutex_init (&dev->reg_mutex);mutex_init (&dev->stats_mutex); --2.25.1
Quoted 9 lines · Florian Fainelli
Update the B53 driver to support VLANs while not filtering. This requires us to enable VLAN globally within the switch upon driver initial configuration (
dev->vlan_enabled).We also need to remove the code that dealt with PVID re-configuration in
b53_vlan_filtering()since that function worked under the assumption that it would only be called to make a bridge VLAN filtering, or not filtering, and we would attempt to move the port's PVID accordingly.
Quoted 5 lines
Now that VLANs are programmed all the time, even in the case of a non-VLAN filtering bridge, we would be programming a
default_pvidfor the bridged switch ports.Signed-off-by Florian Fainelli <[email protected]>
David, Jakub, please hold off applying this just yet, Vladimir has submitted another patch for testing that would be IMHO a better way to deal with DSA switches that have an egress tagged default_pvid. Depending on the outcome of that patch, I will resubmit this one or request that you apply it.
Thanks
Signature · 1 line
Florian
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Fri, 11 Sep 2020 11:28:27 -0700
Quoted 16 lines · Florian Fainelli
Quoted 11 lines
Update the B53 driver to support VLANs while not filtering. This requires us to enable VLAN globally within the switch upon driver initial configuration (
dev->vlan_enabled).
We also need to remove the code that dealt with PVID re-configuration inb53_vlan_filtering()since that function worked under the assumption that it would only be called to make a bridge VLAN filtering, or not filtering, and we would attempt to move the port's PVID accordingly. Now that VLANs are programmed all the time, even in the case of a non-VLAN filtering bridge, we would be programming adefault_pvidfor the bridged switch ports.Quoted 1 line
Signed-off-by Florian Fainelli <[email protected]>
Quoted 5 lines
David, Jakub, please hold off applying this just yet, Vladimir has submitted another patch for testing that would be IMHO a better way to deal with DSA switches that have an egress tagged
default_pvid. Depending on the outcome of that patch, I will resubmit this one or request that you apply it.
Ok.