Let the hardware flood the unknown unicast / multicast if all other ports in the bridge have BR_FLOOD / BR_MCAST_FLOOD enabled. Signed-off-by: David Yang --- drivers/net/dsa/motorcomm/chip.c | 142 +++++++++++++++++++++++++------ drivers/net/dsa/motorcomm/chip.h | 4 + 2 files changed, 122 insertions(+), 24 deletions(-) diff --git a/drivers/net/dsa/motorcomm/chip.c b/drivers/net/dsa/motorcomm/chip.c index 91cc5647f2b6..980d066a4bea 100644 --- a/drivers/net/dsa/motorcomm/chip.c +++ b/drivers/net/dsa/motorcomm/chip.c @@ -2616,6 +2616,7 @@ yt921x_dsa_port_vlan_add(struct dsa_switch *ds, int port, static int yt921x_userport_standalone(struct yt921x_priv *priv, int port) { + struct yt921x_port *pp = &priv->ports[port]; u32 mask; u32 ctrl; int res; @@ -2643,6 +2644,17 @@ static int yt921x_userport_standalone(struct yt921x_priv *priv, int port) if (res) return res; + mask = BIT(port); + res = yt921x_reg_clear_bits(priv, YT921X_FILTER_UNK_UCAST, mask); + if (res) + return res; + res = yt921x_reg_clear_bits(priv, YT921X_FILTER_UNK_MCAST, mask); + if (res) + return res; + + pp->flood = true; + pp->mcast_flood = true; + return 0; } @@ -2721,6 +2733,61 @@ static int yt921x_bridge(struct yt921x_priv *priv, u16 ports_mask) return 0; } +static int +yt921x_bridge_flood_set_type(struct yt921x_priv *priv, u16 ports_mask, int type) +{ + unsigned long targets_mask; + u16 flood_ports_xor; + u32 filter_ctrl; + u16 flood_mask; + u32 addr; + int port; + int res; + + ports_mask &= ~priv->cpu_ports_mask; + + flood_mask = 0; + targets_mask = ports_mask; + for_each_set_bit(port, &targets_mask, YT921X_PORT_NUM) { + struct yt921x_port *pp = &priv->ports[port]; + + if (!type ? pp->flood : pp->mcast_flood) + flood_mask |= BIT(port); + } + + flood_ports_xor = flood_mask ^ ports_mask; + filter_ctrl = 0; + targets_mask = ports_mask; + for_each_set_bit(port, &targets_mask, YT921X_PORT_NUM) { + if (!(flood_ports_xor & ~BIT(port))) + continue; + + filter_ctrl |= BIT(port); + } + + addr = !type ? YT921X_FILTER_UNK_UCAST : YT921X_FILTER_UNK_MCAST; + res = yt921x_reg_update_bits(priv, addr, ports_mask, filter_ctrl); + if (res) + return res; + + /* ACT_UNK is TRAP for every user port; see yt921x_chip_setup_dsa() */ + + return 0; +} + +static int yt921x_bridge_flood_set(struct yt921x_priv *priv, u16 ports_mask) +{ + int res; + + for (int type = 0; type < 2; type++) { + res = yt921x_bridge_flood_set_type(priv, ports_mask, type); + if (res) + return res; + } + + return 0; +} + static int yt921x_bridge_leave(struct yt921x_priv *priv, int port) { int res; @@ -2733,6 +2800,12 @@ static int yt921x_bridge_leave(struct yt921x_priv *priv, int port) if (res) return res; + /* By the time port_bridge_leave() is called, the port is already + * unbridged, thus we cannot recompute flood flags for the affected + * bridge. This leaves some sub-optimality, but the flood will still + * be handled (by the CPU). + */ + return 0; } @@ -2749,6 +2822,10 @@ yt921x_bridge_join(struct yt921x_priv *priv, int port, u16 ports_mask) if (res) return res; + res = yt921x_bridge_flood_set(priv, ports_mask); + if (res) + return res; + return 0; } @@ -2757,7 +2834,12 @@ yt921x_bridge_flags(struct yt921x_priv *priv, int port, struct switchdev_brport_flags flags) { struct yt921x_port *pp = &priv->ports[port]; - bool do_flush; + struct dsa_switch *ds = &priv->ds; + struct net_device *bdev; + bool change_isolated; + struct dsa_port *dp; + bool change_flood; + u32 ports_mask; u32 mask; int res; @@ -2771,36 +2853,48 @@ yt921x_bridge_flags(struct yt921x_priv *priv, int port, return res; } - /* BR_FLOOD, BR_MCAST_FLOOD: see the comment where ACT_UNK_ACTn_TRAP - * is set - */ - /* BR_BCAST_FLOOD: we can filter bcast, but cannot trap them */ - do_flush = false; + change_isolated = false; if (flags.mask & BR_HAIRPIN_MODE) { pp->hairpin = flags.val & BR_HAIRPIN_MODE; - do_flush = true; + change_isolated = true; } if (flags.mask & BR_ISOLATED) { pp->isolated = flags.val & BR_ISOLATED; - do_flush = true; + change_isolated = true; } - if (do_flush) { - struct dsa_switch *ds = &priv->ds; - struct dsa_port *dp = dsa_to_port(ds, port); - struct net_device *bdev; - bdev = dsa_port_bridge_dev_get(dp); - if (bdev) { - u32 ports_mask; + change_flood = false; + if (flags.mask & BR_FLOOD) { + pp->flood = flags.val & BR_FLOOD; + change_flood = true; + } + if (flags.mask & BR_MCAST_FLOOD) { + pp->mcast_flood = flags.val & BR_MCAST_FLOOD; + change_flood = true; + } - ports_mask = dsa_bridge_ports(ds, bdev); - ports_mask |= priv->cpu_ports_mask; - res = yt921x_bridge(priv, ports_mask); - if (res) - return res; - } + if (!change_isolated && !change_flood) + return 0; + + bdev = dsa_port_bridge_dev_get(dp); + if (!bdev) + return 0; + + dp = dsa_to_port(ds, port); + ports_mask = dsa_bridge_ports(ds, bdev); + ports_mask |= priv->cpu_ports_mask; + + if (change_isolated) { + res = yt921x_bridge(priv, ports_mask); + if (res) + return res; + } + if (change_flood) { + res = yt921x_bridge_flood_set(priv, ports_mask); + if (res) + return res; } return 0; @@ -3757,9 +3851,9 @@ static int yt921x_chip_setup_dsa(struct yt921x_priv *priv) * the "bridged" ports, thus we need to trap and handle those packets by * software. * - * If there is no more than one bridge, we might be able to drop them - * directly given some conditions are met, but we trap them in all cases - * for now. + * In some cases, we may offload the flood action to the hardware. This + * is done by fixing UNK_ACT to TRAP, and toggling the FILTER_UNK on the + * appropriate ports. */ ctrl = 0; for (int i = 0; i < YT921X_PORT_NUM; i++) diff --git a/drivers/net/dsa/motorcomm/chip.h b/drivers/net/dsa/motorcomm/chip.h index 25ff77054de3..85b658492f0c 100644 --- a/drivers/net/dsa/motorcomm/chip.h +++ b/drivers/net/dsa/motorcomm/chip.h @@ -801,6 +801,10 @@ struct yt921x_port { bool hairpin:1; /* BR_ISOLATED */ bool isolated:1; + /* BR_FLOOD */ + bool flood:1; + /* BR_MCAST_FLOOD */ + bool mcast_flood:1; #if IS_ENABLED(CONFIG_NET_DSA_YT921X_LEDS) unsigned char led_duty; -- 2.53.0