target/linux/generic/backport-5.10/768-v5.15-net-dsa-mt7530-set-STP-state-on-filter-ID-1.patch

   1 From c5ffcefcb40420528d04c63e7dfc88f2845c9831 Mon Sep 17 00:00:00 2001
   2 From: DENG Qingfang <dqfext@gmail.com>
   3 Date: Wed, 4 Aug 2021 00:04:03 +0800
   4 Subject: [PATCH] net: dsa: mt7530: set STP state on filter ID 1
   5
   6 As filter ID 1 is the only one used for bridges, set STP state on it.
   7
   8 Signed-off-by: DENG Qingfang <dqfext@gmail.com>
   9 Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
  10 Signed-off-by: David S. Miller <davem@davemloft.net>
  11 ---
  12  drivers/net/dsa/mt7530.c | 3 ++-
  13  drivers/net/dsa/mt7530.h | 4 ++--
  14  2 files changed, 4 insertions(+), 3 deletions(-)
  15
  16 --- a/drivers/net/dsa/mt7530.c
  17 +++ b/drivers/net/dsa/mt7530.c
  18 @@ -1131,7 +1131,8 @@ mt7530_stp_state_set(struct dsa_switch *
  19                 break;
  20         }
  21
  22 -       mt7530_rmw(priv, MT7530_SSP_P(port), FID_PST_MASK, stp_state);
  23 +       mt7530_rmw(priv, MT7530_SSP_P(port), FID_PST_MASK(FID_BRIDGED),
  24 +                  FID_PST(FID_BRIDGED, stp_state));
  25  }
  26
  27  static int
  28 --- a/drivers/net/dsa/mt7530.h
  29 +++ b/drivers/net/dsa/mt7530.h
  30 @@ -183,8 +183,8 @@ enum mt7530_vlan_egress_attr {
  31
  32  /* Register for port STP state control */
  33  #define MT7530_SSP_P(x)                        (0x2000 + ((x) * 0x100))
  34 -#define  FID_PST(x)                    ((x) & 0x3)
  35 -#define  FID_PST_MASK                  FID_PST(0x3)
  36 +#define  FID_PST(fid, state)           (((state) & 0x3) << ((fid) * 2))
  37 +#define  FID_PST_MASK(fid)             FID_PST(fid, 0x3)
  38
  39  enum mt7530_stp_state {
  40         MT7530_STP_DISABLED = 0,