Re: [PATCH net-next 3/4] net: dsa: mt7530: set STP state on filter ID 1

[Vladimir Oltean <olteanv@gmail.com>]

On Tue, Aug 03, 2021 at 08:40:21PM +0800, DENG Qingfang wrote:
> As filter ID 1 is the only one used for bridges, set STP state on it.
> 
> Signed-off-by: DENG Qingfang <dqfext@gmail.com>
> ---
> RFC -> v1: only set FID 1's state
> 
>  drivers/net/dsa/mt7530.c | 3 ++-
>  drivers/net/dsa/mt7530.h | 4 ++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
> index 12f449a54833..8d84d7ddad38 100644
> --- a/drivers/net/dsa/mt7530.c
> +++ b/drivers/net/dsa/mt7530.c
> @@ -1147,7 +1147,8 @@ mt7530_stp_state_set(struct dsa_switch *ds, int port, u8 state)
>  		break;
>  	}
>  
> -	mt7530_rmw(priv, MT7530_SSP_P(port), FID_PST_MASK, stp_state);
> +	mt7530_rmw(priv, MT7530_SSP_P(port), FID1_PST_MASK,
> +		   FID1_PST(stp_state));
>  }
>  
>  static int
> diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
> index a308886fdebc..53b7bb1f5368 100644
> --- a/drivers/net/dsa/mt7530.h
> +++ b/drivers/net/dsa/mt7530.h
> @@ -181,8 +181,8 @@ enum mt7530_vlan_egress_attr {
>  
>  /* Register for port STP state control */
>  #define MT7530_SSP_P(x)			(0x2000 + ((x) * 0x100))
> -#define  FID_PST(x)			((x) & 0x3)
> -#define  FID_PST_MASK			FID_PST(0x3)
> +#define  FID1_PST(x)			(((x) & 0x3) << 2)
> +#define  FID1_PST_MASK			FID1_PST(0x3)

Not a reason to resend, but I still would have expected a macro:

#define FID_PST(fid, state)		((state) & 0x3) << ((fid) * 2)
#define FID_PST_MASK(fid)		FID_PST(fid, 0x3)

#define FID_STANDALONE			0
#define FID_BRIDGED			1

and called with:

	mt7530_rmw(priv, MT7530_SSP_P(port), FID_PST_MASK(FID_BRIDGED),
		   FID_PST(FID_BRIDGED, stp_state));

>  
>  enum mt7530_stp_state {
>  	MT7530_STP_DISABLED = 0,
> -- 
> 2.25.1
> 

Anyhow.

Reviewed-by: Vladimir Oltean <olteanv@gmail.com>