[PATCH net-next v3 2/2] net: dsa: mt7530: add support for bridge port isolation

[Wojciech Drewek]

On 18.06.2024 09:17, Matthias Schiffer wrote:
> Remove a pair of ports from the port matrix when both ports have the
> isolated flag set.
> 
> Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
> ---

Reviewed-by: Wojciech Drewek <wojciech.drewek at intel.com>

> 
> v2: removed unintended formatting change
> v3: no changes
> 
>  drivers/net/dsa/mt7530.c | 18 ++++++++++++++++--
>  drivers/net/dsa/mt7530.h |  1 +
>  2 files changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
> index 9ce27ce07d77..ec18e68bf3a8 100644
> --- a/drivers/net/dsa/mt7530.c
> +++ b/drivers/net/dsa/mt7530.c
> @@ -1311,6 +1311,7 @@ static void mt7530_update_port_member(struct mt7530_priv *priv, int port,
>  	struct dsa_port *cpu_dp = dp->cpu_dp;
>  	u32 port_bitmap = BIT(cpu_dp->index);
>  	int other_port;
> +	bool isolated;
>  
>  	dsa_switch_for_each_user_port(other_dp, priv->ds) {
>  		other_port = other_dp->index;
> @@ -1327,7 +1328,9 @@ static void mt7530_update_port_member(struct mt7530_priv *priv, int port,
>  		if (!dsa_port_offloads_bridge_dev(other_dp, bridge_dev))
>  			continue;
>  
> -		if (join) {
> +		isolated = p->isolated && other_p->isolated;
> +
> +		if (join && !isolated) {
>  			other_p->pm |= PCR_MATRIX(BIT(port));
>  			port_bitmap |= BIT(other_port);
>  		} else {
> @@ -1354,7 +1357,7 @@ mt7530_port_pre_bridge_flags(struct dsa_switch *ds, int port,
>  			     struct netlink_ext_ack *extack)
>  {
>  	if (flags.mask & ~(BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD |
> -			   BR_BCAST_FLOOD))
> +			   BR_BCAST_FLOOD | BR_ISOLATED))
>  		return -EINVAL;
>  
>  	return 0;
> @@ -1383,6 +1386,17 @@ mt7530_port_bridge_flags(struct dsa_switch *ds, int port,
>  		mt7530_rmw(priv, MT753X_MFC, BC_FFP(BIT(port)),
>  			   flags.val & BR_BCAST_FLOOD ? BC_FFP(BIT(port)) : 0);
>  
> +	if (flags.mask & BR_ISOLATED) {
> +		struct dsa_port *dp = dsa_to_port(ds, port);
> +		struct net_device *bridge_dev = dsa_port_bridge_dev_get(dp);
> +
> +		priv->ports[port].isolated = !!(flags.val & BR_ISOLATED);
> +
> +		mutex_lock(&priv->reg_mutex);
> +		mt7530_update_port_member(priv, port, bridge_dev, true);
> +		mutex_unlock(&priv->reg_mutex);
> +	}
> +
>  	return 0;
>  }
>  
> diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
> index 2ea4e24628c6..28592123070b 100644
> --- a/drivers/net/dsa/mt7530.h
> +++ b/drivers/net/dsa/mt7530.h
> @@ -721,6 +721,7 @@ struct mt7530_fdb {
>   */
>  struct mt7530_port {
>  	bool enable;
> +	bool isolated;
>  	u32 pm;
>  	u16 pvid;
>  	struct phylink_pcs *sgmii_pcs;