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

   1 From 8d2f3f0e87fe526686f7a2744bf965ce4e99ae41 Mon Sep 17 00:00:00 2001
   2 From: Jonas Gorski <jonas.gorski@gmail.com>
   3 Date: Tue, 25 Nov 2025 08:51:46 +0100
   4 Subject: [PATCH] net: dsa: b53: use same ARL search result offset for BCM5325/65
   5
   6 BCM5365's search result is at the same offset as BCM5325's search
   7 result, and they (mostly) share the same format, so switch BCM5365 to
   8 BCM5325's arl ops.
   9
  10 Fixes: c45655386e53 ("net: dsa: b53: add support for FDB operations on 5325/5365")
  11 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  12 ---
  13  drivers/net/dsa/b53/b53_common.c | 18 +-----------------
  14  drivers/net/dsa/b53/b53_regs.h   |  4 +---
  15  2 files changed, 2 insertions(+), 20 deletions(-)
  16
  17 --- a/drivers/net/dsa/b53/b53_common.c
  18 +++ b/drivers/net/dsa/b53/b53_common.c
  19 @@ -2105,16 +2105,6 @@ static void b53_arl_search_read_25(struc
  20         b53_arl_to_entry_25(ent, mac_vid);
  21  }
  22
  23 -static void b53_arl_search_read_65(struct b53_device *dev, u8 idx,
  24 -                                  struct b53_arl_entry *ent)
  25 -{
  26 -       u64 mac_vid;
  27 -
  28 -       b53_read64(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSTL_0_MACVID_65,
  29 -                  &mac_vid);
  30 -       b53_arl_to_entry_25(ent, mac_vid);
  31 -}
  32 -
  33  static void b53_arl_search_read_89(struct b53_device *dev, u8 idx,
  34                                    struct b53_arl_entry *ent)
  35  {
  36 @@ -2730,12 +2720,6 @@ static const struct b53_arl_ops b53_arl_
  37         .arl_search_read = b53_arl_search_read_25,
  38  };
  39
  40 -static const struct b53_arl_ops b53_arl_ops_65 = {
  41 -       .arl_read_entry = b53_arl_read_entry_25,
  42 -       .arl_write_entry = b53_arl_write_entry_25,
  43 -       .arl_search_read = b53_arl_search_read_65,
  44 -};
  45 -
  46  static const struct b53_arl_ops b53_arl_ops_89 = {
  47         .arl_read_entry = b53_arl_read_entry_89,
  48         .arl_write_entry = b53_arl_write_entry_89,
  49 @@ -2798,7 +2782,7 @@ static const struct b53_chip_data b53_sw
  50                 .arl_buckets = 1024,
  51                 .imp_port = 5,
  52                 .duplex_reg = B53_DUPLEX_STAT_FE,
  53 -               .arl_ops = &b53_arl_ops_65,
  54 +               .arl_ops = &b53_arl_ops_25,
  55         },
  56         {
  57                 .chip_id = BCM5389_DEVICE_ID,
  58 --- a/drivers/net/dsa/b53/b53_regs.h
  59 +++ b/drivers/net/dsa/b53/b53_regs.h
  60 @@ -372,10 +372,8 @@
  61  #define B53_ARL_SRCH_RSLT_MACVID_89    0x33
  62  #define B53_ARL_SRCH_RSLT_MACVID_63XX  0x34
  63
  64 -/* Single register search result on 5325 */
  65 +/* Single register search result on 5325/5365 */
  66  #define B53_ARL_SRCH_RSTL_0_MACVID_25  0x24
  67 -/* Single register search result on 5365 */
  68 -#define B53_ARL_SRCH_RSTL_0_MACVID_65  0x30
  69
  70  /* ARL Search Data Result (32 bit) */
  71  #define B53_ARL_SRCH_RSTL_0            0x68