net: dsa: b53: Add support for port_egress_floods callback
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 13 Sep 2019 03:28:39 +0000 (20:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 Sep 2019 07:06:12 +0000 (09:06 +0200)
Add support for configuring the per-port egress flooding control for
both Unicast and Multicast traffic.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/b53/b53_common.c
drivers/net/dsa/b53/b53_priv.h

index 7d328a5f0161290c577393fa3d945d4af4cc8e63..526ba2ab66f10b027ec5861d481be26a26e890af 100644 (file)
@@ -342,6 +342,13 @@ static void b53_set_forwarding(struct b53_device *dev, int enable)
        b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &mgmt);
        mgmt |= B53_MII_DUMB_FWDG_EN;
        b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt);
+
+       /* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether
+        * frames should be flooded or not.
+        */
+       b53_read8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, &mgmt);
+       mgmt |= B53_UC_FWD_EN | B53_MC_FWD_EN;
+       b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt);
 }
 
 static void b53_enable_vlan(struct b53_device *dev, bool enable,
@@ -1753,6 +1760,31 @@ void b53_br_fast_age(struct dsa_switch *ds, int port)
 }
 EXPORT_SYMBOL(b53_br_fast_age);
 
+int b53_br_egress_floods(struct dsa_switch *ds, int port,
+                        bool unicast, bool multicast)
+{
+       struct b53_device *dev = ds->priv;
+       u16 uc, mc;
+
+       b53_read16(dev, B53_CTRL_PAGE, B53_UC_FWD_EN, &uc);
+       if (unicast)
+               uc |= BIT(port);
+       else
+               uc &= ~BIT(port);
+       b53_write16(dev, B53_CTRL_PAGE, B53_UC_FWD_EN, uc);
+
+       b53_read16(dev, B53_CTRL_PAGE, B53_MC_FWD_EN, &mc);
+       if (multicast)
+               mc |= BIT(port);
+       else
+               mc &= ~BIT(port);
+       b53_write16(dev, B53_CTRL_PAGE, B53_MC_FWD_EN, mc);
+
+       return 0;
+
+}
+EXPORT_SYMBOL(b53_br_egress_floods);
+
 static bool b53_possible_cpu_port(struct dsa_switch *ds, int port)
 {
        /* Broadcom switches will accept enabling Broadcom tags on the
@@ -1953,6 +1985,7 @@ static const struct dsa_switch_ops b53_switch_ops = {
        .port_bridge_leave      = b53_br_leave,
        .port_stp_state_set     = b53_br_set_stp_state,
        .port_fast_age          = b53_br_fast_age,
+       .port_egress_floods     = b53_br_egress_floods,
        .port_vlan_filtering    = b53_vlan_filtering,
        .port_vlan_prepare      = b53_vlan_prepare,
        .port_vlan_add          = b53_vlan_add,
index f25bc80c4ffcfdc0fd591b21d3366191a192f950..a7dd8acc281b5f94bf700c9c7555f6a865b9c308 100644 (file)
@@ -319,6 +319,8 @@ int b53_br_join(struct dsa_switch *ds, int port, struct net_device *bridge);
 void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *bridge);
 void b53_br_set_stp_state(struct dsa_switch *ds, int port, u8 state);
 void b53_br_fast_age(struct dsa_switch *ds, int port);
+int b53_br_egress_floods(struct dsa_switch *ds, int port,
+                        bool unicast, bool multicast);
 void b53_port_event(struct dsa_switch *ds, int port);
 void b53_phylink_validate(struct dsa_switch *ds, int port,
                          unsigned long *supported,