git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From e6c34597f89ac98c06176eed57f125252015a330 Mon Sep 17 00:00:00 2001
   2 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
   3 Date: Tue, 11 Jun 2024 15:54:31 +0200
   4 Subject: net: dsa: lantiq_gswip: Consistently use macros for the mac bridge
   5  table
   6
   7 Only bits [5:0] in mac_bridge.key[3] are reserved for the FID.
   8 Also, for dynamic (learned) entries, bits [7:4] in mac_bridge.val[0]
   9 represents the port.
  10
  11 Introduce new macros GSWIP_TABLE_MAC_BRIDGE_KEY3_FID and
  12 GSWIP_TABLE_MAC_BRIDGE_VAL0_PORT macro and use it throughout the driver.
  13 Also rename and update GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC to use the
  14 BIT() macro. This makes the driver code easier to understand.
  15
  16 Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
  17 Signed-off-by: Martin Schiller <ms@dev.tdt.de>
  18 Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
  19 Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
  20 Link: https://lore.kernel.org/r/20240611135434.3180973-10-ms@dev.tdt.de
  21 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  22 ---
  23  drivers/net/dsa/lantiq_gswip.c | 18 +++++++++++-------
  24  1 file changed, 11 insertions(+), 7 deletions(-)
  25
  26 --- a/drivers/net/dsa/lantiq_gswip.c
  27 +++ b/drivers/net/dsa/lantiq_gswip.c
  28 @@ -236,7 +236,9 @@
  29  #define GSWIP_TABLE_ACTIVE_VLAN                0x01
  30  #define GSWIP_TABLE_VLAN_MAPPING       0x02
  31  #define GSWIP_TABLE_MAC_BRIDGE         0x0b
  32 -#define  GSWIP_TABLE_MAC_BRIDGE_STATIC 0x01    /* Static not, aging entry */
  33 +#define  GSWIP_TABLE_MAC_BRIDGE_KEY3_FID       GENMASK(5, 0)   /* Filtering identifier */
  34 +#define  GSWIP_TABLE_MAC_BRIDGE_VAL0_PORT      GENMASK(7, 4)   /* Port on learned entries */
  35 +#define  GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC    BIT(0)          /* Static, non-aging entry */
  36
  37  #define XRX200_GPHY_FW_ALIGN   (16 * 1024)
  38
  39 @@ -1297,10 +1299,11 @@ static void gswip_port_fast_age(struct d
  40                 if (!mac_bridge.valid)
  41                         continue;
  42
  43 -               if (mac_bridge.val[1] & GSWIP_TABLE_MAC_BRIDGE_STATIC)
  44 +               if (mac_bridge.val[1] & GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC)
  45                         continue;
  46
  47 -               if (((mac_bridge.val[0] & GENMASK(7, 4)) >> 4) != port)
  48 +               if (port != FIELD_GET(GSWIP_TABLE_MAC_BRIDGE_VAL0_PORT,
  49 +                                     mac_bridge.val[0]))
  50                         continue;
  51
  52                 mac_bridge.valid = false;
  53 @@ -1375,9 +1378,9 @@ static int gswip_port_fdb(struct dsa_swi
  54         mac_bridge.key[0] = addr[5] | (addr[4] << 8);
  55         mac_bridge.key[1] = addr[3] | (addr[2] << 8);
  56         mac_bridge.key[2] = addr[1] | (addr[0] << 8);
  57 -       mac_bridge.key[3] = fid;
  58 +       mac_bridge.key[3] = FIELD_PREP(GSWIP_TABLE_MAC_BRIDGE_KEY3_FID, fid);
  59         mac_bridge.val[0] = add ? BIT(port) : 0; /* port map */
  60 -       mac_bridge.val[1] = GSWIP_TABLE_MAC_BRIDGE_STATIC;
  61 +       mac_bridge.val[1] = GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC;
  62         mac_bridge.valid = add;
  63
  64         err = gswip_pce_table_entry_write(priv, &mac_bridge);
  65 @@ -1431,14 +1434,15 @@ static int gswip_port_fdb_dump(struct ds
  66                 addr[2] = (mac_bridge.key[1] >> 8) & 0xff;
  67                 addr[1] = mac_bridge.key[2] & 0xff;
  68                 addr[0] = (mac_bridge.key[2] >> 8) & 0xff;
  69 -               if (mac_bridge.val[1] & GSWIP_TABLE_MAC_BRIDGE_STATIC) {
  70 +               if (mac_bridge.val[1] & GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC) {
  71                         if (mac_bridge.val[0] & BIT(port)) {
  72                                 err = cb(addr, 0, true, data);
  73                                 if (err)
  74                                         return err;
  75                         }
  76                 } else {
  77 -                       if (((mac_bridge.val[0] & GENMASK(7, 4)) >> 4) == port) {
  78 +                       if (port == FIELD_GET(GSWIP_TABLE_MAC_BRIDGE_VAL0_PORT,
  79 +                                             mac_bridge.val[0])) {
  80                                 err = cb(addr, 0, false, data);
  81                                 if (err)
  82                                         return err;