Commit ee47ed08 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: dsa: b53: Add debug prints in b53_vlan_enable()

Having dynamic debug prints in b53_vlan_enable() has been helpful to
uncover a recent but update the function to indicate the port being
configured (or -1 for initial setup) and include the global VLAN enabled
and VLAN filtering enable status.
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34bb9751
...@@ -349,7 +349,7 @@ static void b53_set_forwarding(struct b53_device *dev, int enable) ...@@ -349,7 +349,7 @@ static void b53_set_forwarding(struct b53_device *dev, int enable)
b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt); b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt);
} }
static void b53_enable_vlan(struct b53_device *dev, bool enable, static void b53_enable_vlan(struct b53_device *dev, int port, bool enable,
bool enable_filtering) bool enable_filtering)
{ {
u8 mgmt, vc0, vc1, vc4 = 0, vc5; u8 mgmt, vc0, vc1, vc4 = 0, vc5;
...@@ -431,6 +431,9 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable, ...@@ -431,6 +431,9 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable,
b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt); b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);
dev->vlan_enabled = enable; dev->vlan_enabled = enable;
dev_dbg(dev->dev, "Port %d VLAN enabled: %d, filtering: %d\n",
port, enable, enable_filtering);
} }
static int b53_set_jumbo(struct b53_device *dev, bool enable, bool allow_10_100) static int b53_set_jumbo(struct b53_device *dev, bool enable, bool allow_10_100)
...@@ -743,7 +746,7 @@ int b53_configure_vlan(struct dsa_switch *ds) ...@@ -743,7 +746,7 @@ int b53_configure_vlan(struct dsa_switch *ds)
b53_do_vlan_op(dev, VTA_CMD_CLEAR); b53_do_vlan_op(dev, VTA_CMD_CLEAR);
} }
b53_enable_vlan(dev, dev->vlan_enabled, ds->vlan_filtering); b53_enable_vlan(dev, -1, dev->vlan_enabled, ds->vlan_filtering);
b53_for_each_port(dev, i) b53_for_each_port(dev, i)
b53_write16(dev, B53_VLAN_PAGE, b53_write16(dev, B53_VLAN_PAGE,
...@@ -1429,7 +1432,7 @@ int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering, ...@@ -1429,7 +1432,7 @@ int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,
{ {
struct b53_device *dev = ds->priv; struct b53_device *dev = ds->priv;
b53_enable_vlan(dev, dev->vlan_enabled, vlan_filtering); b53_enable_vlan(dev, port, dev->vlan_enabled, vlan_filtering);
return 0; return 0;
} }
...@@ -1454,7 +1457,7 @@ static int b53_vlan_prepare(struct dsa_switch *ds, int port, ...@@ -1454,7 +1457,7 @@ static int b53_vlan_prepare(struct dsa_switch *ds, int port,
if (vlan->vid >= dev->num_vlans) if (vlan->vid >= dev->num_vlans)
return -ERANGE; return -ERANGE;
b53_enable_vlan(dev, true, ds->vlan_filtering); b53_enable_vlan(dev, port, true, ds->vlan_filtering);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment