target/linux/generic/backport-5.10/890-v5.11-net-dsa-mv88e6xxx-Export-VTU-as-devlink-region.patch

   1 From ca4d632aef031c7946c42a6eb873d24ab6474f17 Mon Sep 17 00:00:00 2001
   2 From: Tobias Waldekranz <tobias@waldekranz.com>
   3 Date: Mon, 9 Nov 2020 09:29:27 +0100
   4 Subject: [PATCH] net: dsa: mv88e6xxx: Export VTU as devlink region
   5
   6 Export the raw VTU data and related registers in a devlink region so
   7 that it can be inspected from userspace and compared to the current
   8 bridge configuration.
   9
  10 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
  11 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  12 Link: https://lore.kernel.org/r/20201109082927.8684-1-tobias@waldekranz.com
  13 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  14 ---
  15  drivers/net/dsa/mv88e6xxx/chip.h        |   1 +
  16  drivers/net/dsa/mv88e6xxx/devlink.c     | 105 +++++++++++++++++++++++-
  17  drivers/net/dsa/mv88e6xxx/global1.h     |   2 +
  18  drivers/net/dsa/mv88e6xxx/global1_vtu.c |   4 +-
  19  4 files changed, 109 insertions(+), 3 deletions(-)
  20
  21 --- a/drivers/net/dsa/mv88e6xxx/chip.h
  22 +++ b/drivers/net/dsa/mv88e6xxx/chip.h
  23 @@ -246,6 +246,7 @@ enum mv88e6xxx_region_id {
  24         MV88E6XXX_REGION_GLOBAL1 = 0,
  25         MV88E6XXX_REGION_GLOBAL2,
  26         MV88E6XXX_REGION_ATU,
  27 +       MV88E6XXX_REGION_VTU,
  28
  29         _MV88E6XXX_REGION_MAX,
  30  };
  31 --- a/drivers/net/dsa/mv88e6xxx/devlink.c
  32 +++ b/drivers/net/dsa/mv88e6xxx/devlink.c
  33 @@ -417,6 +417,92 @@ out:
  34         return err;
  35  }
  36
  37 +/**
  38 + * struct mv88e6xxx_devlink_vtu_entry - Devlink VTU entry
  39 + * @fid:   Global1/2:   FID and VLAN policy.
  40 + * @sid:   Global1/3:   SID, unknown filters and learning.
  41 + * @op:    Global1/5:   FID (old chipsets).
  42 + * @vid:   Global1/6:   VID, valid, and page.
  43 + * @data:  Global1/7-9: Membership data and priority override.
  44 + * @resvd: Reserved. Also happens to align the size to 16B.
  45 + *
  46 + * The VTU entry format varies between chipset generations, the
  47 + * descriptions above represent the superset of all possible
  48 + * information, not all fields are valid on all devices. Since this is
  49 + * a low-level debug interface, copy all data verbatim and defer
  50 + * parsing to the consumer.
  51 + */
  52 +struct mv88e6xxx_devlink_vtu_entry {
  53 +       u16 fid;
  54 +       u16 sid;
  55 +       u16 op;
  56 +       u16 vid;
  57 +       u16 data[3];
  58 +       u16 resvd;
  59 +};
  60 +
  61 +static int mv88e6xxx_region_vtu_snapshot(struct devlink *dl,
  62 +                                        const struct devlink_region_ops *ops,
  63 +                                        struct netlink_ext_ack *extack,
  64 +                                        u8 **data)
  65 +{
  66 +       struct mv88e6xxx_devlink_vtu_entry *table, *entry;
  67 +       struct dsa_switch *ds = dsa_devlink_to_ds(dl);
  68 +       struct mv88e6xxx_chip *chip = ds->priv;
  69 +       struct mv88e6xxx_vtu_entry vlan;
  70 +       int err;
  71 +
  72 +       table = kcalloc(chip->info->max_vid + 1,
  73 +                       sizeof(struct mv88e6xxx_devlink_vtu_entry),
  74 +                       GFP_KERNEL);
  75 +       if (!table)
  76 +               return -ENOMEM;
  77 +
  78 +       entry = table;
  79 +       vlan.vid = chip->info->max_vid;
  80 +       vlan.valid = false;
  81 +
  82 +       mv88e6xxx_reg_lock(chip);
  83 +
  84 +       do {
  85 +               err = mv88e6xxx_g1_vtu_getnext(chip, &vlan);
  86 +               if (err)
  87 +                       break;
  88 +
  89 +               if (!vlan.valid)
  90 +                       break;
  91 +
  92 +               err = err ? : mv88e6xxx_g1_read(chip, MV88E6352_G1_VTU_FID,
  93 +                                               &entry->fid);
  94 +               err = err ? : mv88e6xxx_g1_read(chip, MV88E6352_G1_VTU_SID,
  95 +                                               &entry->sid);
  96 +               err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_OP,
  97 +                                               &entry->op);
  98 +               err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_VID,
  99 +                                               &entry->vid);
 100 +               err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_DATA1,
 101 +                                               &entry->data[0]);
 102 +               err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_DATA2,
 103 +                                               &entry->data[1]);
 104 +               err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_DATA3,
 105 +                                               &entry->data[2]);
 106 +               if (err)
 107 +                       break;
 108 +
 109 +               entry++;
 110 +       } while (vlan.vid < chip->info->max_vid);
 111 +
 112 +       mv88e6xxx_reg_unlock(chip);
 113 +
 114 +       if (err) {
 115 +               kfree(table);
 116 +               return err;
 117 +       }
 118 +
 119 +       *data = (u8 *)table;
 120 +       return 0;
 121 +}
 122 +
 123  static int mv88e6xxx_region_port_snapshot(struct devlink_port *devlink_port,
 124                                           const struct devlink_port_region_ops *ops,
 125                                           struct netlink_ext_ack *extack,
 126 @@ -475,6 +561,12 @@ static struct devlink_region_ops mv88e6x
 127         .destructor = kfree,
 128  };
 129
 130 +static struct devlink_region_ops mv88e6xxx_region_vtu_ops = {
 131 +       .name = "vtu",
 132 +       .snapshot = mv88e6xxx_region_vtu_snapshot,
 133 +       .destructor = kfree,
 134 +};
 135 +
 136  static const struct devlink_port_region_ops mv88e6xxx_region_port_ops = {
 137         .name = "port",
 138         .snapshot = mv88e6xxx_region_port_snapshot,
 139 @@ -498,6 +590,10 @@ static struct mv88e6xxx_region mv88e6xxx
 140                 .ops = &mv88e6xxx_region_atu_ops
 141           /* calculated at runtime */
 142         },
 143 +       [MV88E6XXX_REGION_VTU] = {
 144 +               .ops = &mv88e6xxx_region_vtu_ops
 145 +         /* calculated at runtime */
 146 +       },
 147  };
 148
 149  static void
 150 @@ -576,9 +672,16 @@ static int mv88e6xxx_setup_devlink_regio
 151                 ops = mv88e6xxx_regions[i].ops;
 152                 size = mv88e6xxx_regions[i].size;
 153
 154 -               if (i == MV88E6XXX_REGION_ATU)
 155 +               switch (i) {
 156 +               case MV88E6XXX_REGION_ATU:
 157                         size = mv88e6xxx_num_databases(chip) *
 158                                 sizeof(struct mv88e6xxx_devlink_atu_entry);
 159 +                       break;
 160 +               case MV88E6XXX_REGION_VTU:
 161 +                       size = chip->info->max_vid *
 162 +                               sizeof(struct mv88e6xxx_devlink_vtu_entry);
 163 +                       break;
 164 +               }
 165
 166                 region = dsa_devlink_region_create(ds, ops, 1, size);
 167                 if (IS_ERR(region))
 168 --- a/drivers/net/dsa/mv88e6xxx/global1.h
 169 +++ b/drivers/net/dsa/mv88e6xxx/global1.h
 170 @@ -330,6 +330,8 @@ void mv88e6xxx_g1_atu_prob_irq_free(stru
 171  int mv88e6165_g1_atu_get_hash(struct mv88e6xxx_chip *chip, u8 *hash);
 172  int mv88e6165_g1_atu_set_hash(struct mv88e6xxx_chip *chip, u8 hash);
 173
 174 +int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
 175 +                            struct mv88e6xxx_vtu_entry *entry);
 176  int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
 177                              struct mv88e6xxx_vtu_entry *entry);
 178  int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
 179 --- a/drivers/net/dsa/mv88e6xxx/global1_vtu.c
 180 +++ b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
 181 @@ -307,8 +307,8 @@ static int mv88e6xxx_g1_vtu_stu_get(stru
 182         return 0;
 183  }
 184
 185 -static int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
 186 -                                   struct mv88e6xxx_vtu_entry *entry)
 187 +int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
 188 +                            struct mv88e6xxx_vtu_entry *entry)
 189  {
 190         int err;
 191