Commit 3fa21270 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller

net: dsa: sja1105: manage the forwarding domain towards DSA ports

Manage DSA links towards other switches, be they host ports or cascade
ports, the same as the CPU port, i.e. allow forwarding and flooding
unconditionally from all user ports.

We send packets as always VLAN-tagged on a DSA port, and we rely on the
cross-chip notifiers from tag_8021q to install the RX VLAN of a switch
port only on the proper remote ports of another switch (the ports that
are in the same bridging domain). So if there is no cross-chip bridging
in the system, the flooded packets will be sent on the DSA ports too,
but they will be dropped by the remote switches due to either
(a) a lack of the RX VLAN in the VLAN table of the ingress DSA port, or
(b) a lack of valid destinations for those packets, due to a lack of the
    RX VLAN on the user ports of the switch

Note that switches which only transport packets in a cross-chip bridge,
but have no user ports of their own as part of that bridge, such as
switch 1 in this case:

                    DSA link                   DSA link
  sw0p0 sw0p1 sw0p2 -------- sw1p0 sw1p2 sw1p3 -------- sw2p0 sw2p2 sw2p3

ip link set sw0p0 master br0
ip link set sw2p3 master br0

will still work, because the tag_8021q cross-chip notifiers keep the RX
VLANs installed on all DSA ports.
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30a100e6
...@@ -475,7 +475,8 @@ static int sja1105_init_l2_forwarding(struct sja1105_private *priv) ...@@ -475,7 +475,8 @@ static int sja1105_init_l2_forwarding(struct sja1105_private *priv)
struct sja1105_l2_forwarding_entry *l2fwd; struct sja1105_l2_forwarding_entry *l2fwd;
struct dsa_switch *ds = priv->ds; struct dsa_switch *ds = priv->ds;
struct sja1105_table *table; struct sja1105_table *table;
int i, j; int port, tc;
int from, to;
table = &priv->static_config.tables[BLK_IDX_L2_FORWARDING]; table = &priv->static_config.tables[BLK_IDX_L2_FORWARDING];
...@@ -493,47 +494,82 @@ static int sja1105_init_l2_forwarding(struct sja1105_private *priv) ...@@ -493,47 +494,82 @@ static int sja1105_init_l2_forwarding(struct sja1105_private *priv)
l2fwd = table->entries; l2fwd = table->entries;
/* First 5 entries define the forwarding rules */ /* First 5 entries in the L2 Forwarding Table define the forwarding
for (i = 0; i < ds->num_ports; i++) { * rules and the VLAN PCP to ingress queue mapping.
unsigned int upstream = dsa_upstream_port(priv->ds, i); * Set up the ingress queue mapping first.
*/
for (port = 0; port < ds->num_ports; port++) {
if (dsa_is_unused_port(ds, port))
continue;
if (dsa_is_unused_port(ds, i)) for (tc = 0; tc < SJA1105_NUM_TC; tc++)
l2fwd[port].vlan_pmap[tc] = tc;
}
/* Then manage the forwarding domain for user ports. These can forward
* only to the always-on domain (CPU port and DSA links)
*/
for (from = 0; from < ds->num_ports; from++) {
if (!dsa_is_user_port(ds, from))
continue; continue;
for (j = 0; j < SJA1105_NUM_TC; j++) for (to = 0; to < ds->num_ports; to++) {
l2fwd[i].vlan_pmap[j] = j; if (!dsa_is_cpu_port(ds, to) &&
!dsa_is_dsa_port(ds, to))
continue;
/* All ports start up with egress flooding enabled, l2fwd[from].bc_domain |= BIT(to);
* including the CPU port. l2fwd[from].fl_domain |= BIT(to);
*/
priv->ucast_egress_floods |= BIT(i); sja1105_port_allow_traffic(l2fwd, from, to, true);
priv->bcast_egress_floods |= BIT(i); }
}
if (i == upstream) /* Then manage the forwarding domain for DSA links and CPU ports (the
* always-on domain). These can send packets to any enabled port except
* themselves.
*/
for (from = 0; from < ds->num_ports; from++) {
if (!dsa_is_cpu_port(ds, from) && !dsa_is_dsa_port(ds, from))
continue; continue;
sja1105_port_allow_traffic(l2fwd, i, upstream, true); for (to = 0; to < ds->num_ports; to++) {
sja1105_port_allow_traffic(l2fwd, upstream, i, true); if (dsa_is_unused_port(ds, to))
continue;
if (from == to)
continue;
l2fwd[i].bc_domain = BIT(upstream); l2fwd[from].bc_domain |= BIT(to);
l2fwd[i].fl_domain = BIT(upstream); l2fwd[from].fl_domain |= BIT(to);
l2fwd[upstream].bc_domain |= BIT(i); sja1105_port_allow_traffic(l2fwd, from, to, true);
l2fwd[upstream].fl_domain |= BIT(i); }
}
/* Finally, manage the egress flooding domain. All ports start up with
* flooding enabled, including the CPU port and DSA links.
*/
for (port = 0; port < ds->num_ports; port++) {
if (dsa_is_unused_port(ds, port))
continue;
priv->ucast_egress_floods |= BIT(port);
priv->bcast_egress_floods |= BIT(port);
} }
/* Next 8 entries define VLAN PCP mapping from ingress to egress. /* Next 8 entries define VLAN PCP mapping from ingress to egress.
* Create a one-to-one mapping. * Create a one-to-one mapping.
*/ */
for (i = 0; i < SJA1105_NUM_TC; i++) { for (tc = 0; tc < SJA1105_NUM_TC; tc++) {
for (j = 0; j < ds->num_ports; j++) { for (port = 0; port < ds->num_ports; port++) {
if (dsa_is_unused_port(ds, j)) if (dsa_is_unused_port(ds, port))
continue; continue;
l2fwd[ds->num_ports + i].vlan_pmap[j] = i; l2fwd[ds->num_ports + tc].vlan_pmap[port] = tc;
} }
l2fwd[ds->num_ports + i].type_egrpcp2outputq = true; l2fwd[ds->num_ports + tc].type_egrpcp2outputq = true;
} }
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