Commit 0cc36980 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller

net: dsa: felix: stop clearing CPU flooding in felix_setup_tag_8021q

felix_migrate_flood_to_tag_8021q_port() takes care of clearing the
flooding bits on the old CPU port (which was the CPU port module), so
manually clearing this bit from PGID_UC, PGID_MC, PGID_BC is redundant.
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90897569
...@@ -465,7 +465,6 @@ static int felix_update_trapping_destinations(struct dsa_switch *ds, ...@@ -465,7 +465,6 @@ static int felix_update_trapping_destinations(struct dsa_switch *ds,
static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu, bool change) static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu, bool change)
{ {
struct ocelot *ocelot = ds->priv; struct ocelot *ocelot = ds->priv;
unsigned long cpu_flood;
struct dsa_port *dp; struct dsa_port *dp;
int err; int err;
...@@ -487,15 +486,6 @@ static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu, bool change) ...@@ -487,15 +486,6 @@ static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu, bool change)
ANA_PORT_CPU_FWD_BPDU_CFG, dp->index); ANA_PORT_CPU_FWD_BPDU_CFG, dp->index);
} }
/* In tag_8021q mode, the CPU port module is unused, except for PTP
* frames. So we want to disable flooding of any kind to the CPU port
* module, since packets going there will end in a black hole.
*/
cpu_flood = ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports));
ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_UC);
ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_MC);
ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_BC);
err = dsa_tag_8021q_register(ds, htons(ETH_P_8021AD)); err = dsa_tag_8021q_register(ds, htons(ETH_P_8021AD));
if (err) if (err)
return err; return err;
......
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