target/linux/generic/backport-5.15/705-12-v6.0-net-dsa-mt7530-rework-mt753-01-_setup.patch

   1 From 1f0dfd443eea7fc3e818e96f7c8264913ba41859 Mon Sep 17 00:00:00 2001
   2 From: Frank Wunderlich <frank-w@public-files.de>
   3 Date: Fri, 10 Jun 2022 19:05:38 +0200
   4 Subject: [PATCH 12/13] net: dsa: mt7530: rework mt753[01]_setup
   5
   6 Enumerate available cpu-ports instead of using hardcoded constant.
   7
   8 Suggested-by: Vladimir Oltean <olteanv@gmail.com>
   9 Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
  10 Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
  11 Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
  12 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  13 ---
  14  drivers/net/dsa/mt7530.c | 25 +++++++++++++++++++++----
  15  1 file changed, 21 insertions(+), 4 deletions(-)
  16
  17 --- a/drivers/net/dsa/mt7530.c
  18 +++ b/drivers/net/dsa/mt7530.c
  19 @@ -2101,11 +2101,12 @@ static int
  20  mt7530_setup(struct dsa_switch *ds)
  21  {
  22         struct mt7530_priv *priv = ds->priv;
  23 +       struct device_node *dn = NULL;
  24         struct device_node *phy_node;
  25         struct device_node *mac_np;
  26         struct mt7530_dummy_poll p;
  27         phy_interface_t interface;
  28 -       struct device_node *dn;
  29 +       struct dsa_port *cpu_dp;
  30         u32 id, val;
  31         int ret, i;
  32
  33 @@ -2113,7 +2114,19 @@ mt7530_setup(struct dsa_switch *ds)
  34          * controller also is the container for two GMACs nodes representing
  35          * as two netdev instances.
  36          */
  37 -       dn = dsa_to_port(ds, MT7530_CPU_PORT)->master->dev.of_node->parent;
  38 +       dsa_switch_for_each_cpu_port(cpu_dp, ds) {
  39 +               dn = cpu_dp->master->dev.of_node->parent;
  40 +               /* It doesn't matter which CPU port is found first,
  41 +                * their masters should share the same parent OF node
  42 +                */
  43 +               break;
  44 +       }
  45 +
  46 +       if (!dn) {
  47 +               dev_err(ds->dev, "parent OF node of DSA master not found");
  48 +               return -EINVAL;
  49 +       }
  50 +
  51         ds->assisted_learning_on_cpu_port = true;
  52         ds->mtu_enforcement_ingress = true;
  53
  54 @@ -2286,6 +2299,7 @@ mt7531_setup(struct dsa_switch *ds)
  55  {
  56         struct mt7530_priv *priv = ds->priv;
  57         struct mt7530_dummy_poll p;
  58 +       struct dsa_port *cpu_dp;
  59         u32 val, id;
  60         int ret, i;
  61
  62 @@ -2360,8 +2374,11 @@ mt7531_setup(struct dsa_switch *ds)
  63                                  CORE_PLL_GROUP4, val);
  64
  65         /* BPDU to CPU port */
  66 -       mt7530_rmw(priv, MT7531_CFC, MT7531_CPU_PMAP_MASK,
  67 -                  BIT(MT7530_CPU_PORT));
  68 +       dsa_switch_for_each_cpu_port(cpu_dp, ds) {
  69 +               mt7530_rmw(priv, MT7531_CFC, MT7531_CPU_PMAP_MASK,
  70 +                          BIT(cpu_dp->index));
  71 +               break;
  72 +       }
  73         mt7530_rmw(priv, MT753X_BPC, MT753X_BPDU_PORT_FW_MASK,
  74                    MT753X_BPDU_CPU_ONLY);
  75