Skip to content

Commit

Permalink
net: dsa: b53: Restore VLAN entries upon (re)configuration
Browse files Browse the repository at this point in the history
The first time b53_configure_vlan() is called we have not configured any
VLAN entries yet, since that happens later when interfaces get brought
up. When b53_configure_vlan() is called again from suspend/resume we
need to restore all VLAN entries though.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Mar 31, 2020
1 parent d0802dc commit d7a0b1f
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions drivers/net/dsa/b53/b53_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,9 @@ int b53_configure_vlan(struct dsa_switch *ds)
{
struct b53_device *dev = ds->priv;
struct b53_vlan vl = { 0 };
struct b53_vlan *v;
int i, def_vid;
u16 vid;

def_vid = b53_default_pvid(dev);

Expand All @@ -699,6 +701,19 @@ int b53_configure_vlan(struct dsa_switch *ds)
b53_write16(dev, B53_VLAN_PAGE,
B53_VLAN_PORT_DEF_TAG(i), def_vid);

/* Upon initial call we have not set-up any VLANs, but upon
* system resume, we need to restore all VLAN entries.
*/
for (vid = def_vid; vid < dev->num_vlans; vid++) {
v = &dev->vlans[vid];

if (!v->members)
continue;

b53_set_vlan_entry(dev, vid, v);
b53_fast_age_vlan(dev, vid);
}

return 0;
}
EXPORT_SYMBOL(b53_configure_vlan);
Expand Down

0 comments on commit d7a0b1f

Please sign in to comment.