net: dsa: felix: start off with flooding disabled on the CPU port

The driver probes with all ports as standalone, and it supports unicast
filtering. So DSA will call port_fdb_add() for all necessary addresses
on the current CPU port. We also handle migrations when the CPU port
hardware resource changes (on tagging protocol change), so there should
not be any unknown address that we have to receive while not promiscuous.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index f263712a007b27be715eb84189df5e6f463e7c28..e9ce0d687713e4254860fd7acd0b4040d42b3293 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -614,7 +614,6 @@ static void felix_npi_port_deinit(struct ocelot *ocelot, int port)
 static int felix_setup_tag_npi(struct dsa_switch *ds, int cpu, bool change)
 {
        struct ocelot *ocelot = ds->priv;
-       unsigned long cpu_flood;
        int err;
 
        if (change) {
@@ -633,22 +632,6 @@ static int felix_setup_tag_npi(struct dsa_switch *ds, int cpu, bool change)
 
        felix_npi_port_init(ocelot, cpu);
 
-       /* Include the CPU port module (and indirectly, the NPI port)
-        * in the forwarding mask for unknown unicast - the hardware
-        * default value for ANA_FLOODING_FLD_UNICAST excludes
-        * BIT(ocelot->num_phys_ports), and so does ocelot_init,
-        * since Ocelot relies on whitelisting MAC addresses towards
-        * PGID_CPU.
-        * We do this because DSA does not yet perform RX filtering,
-        * and the NPI port does not perform source address learning,
-        * so traffic sent to Linux is effectively unknown from the
-        * switch's perspective.
-        */
-       cpu_flood = ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports));
-       ocelot_rmw_rix(ocelot, cpu_flood, cpu_flood, ANA_PGID_PGID, PGID_UC);
-       ocelot_rmw_rix(ocelot, cpu_flood, cpu_flood, ANA_PGID_PGID, PGID_MC);
-       ocelot_rmw_rix(ocelot, cpu_flood, cpu_flood, ANA_PGID_PGID, PGID_BC);
-
        return 0;
 
 out_migrate_fdbs: