mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-08 21:52:09 -05:00
b0e9371cb1
These patches fix the remaining issues with BCM5325 switches and allow dropping the default VLAN on Huawei HG556a. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
From 8d2f3f0e87fe526686f7a2744bf965ce4e99ae41 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Date: Tue, 25 Nov 2025 08:51:46 +0100
|
|
Subject: [PATCH] net: dsa: b53: use same ARL search result offset for BCM5325/65
|
|
|
|
BCM5365's search result is at the same offset as BCM5325's search
|
|
result, and they (mostly) share the same format, so switch BCM5365 to
|
|
BCM5325's arl ops.
|
|
|
|
Fixes: c45655386e53 ("net: dsa: b53: add support for FDB operations on 5325/5365")
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 18 +-----------------
|
|
drivers/net/dsa/b53/b53_regs.h | 4 +---
|
|
2 files changed, 2 insertions(+), 20 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -2105,16 +2105,6 @@ static void b53_arl_search_read_25(struc
|
|
b53_arl_to_entry_25(ent, mac_vid);
|
|
}
|
|
|
|
-static void b53_arl_search_read_65(struct b53_device *dev, u8 idx,
|
|
- struct b53_arl_entry *ent)
|
|
-{
|
|
- u64 mac_vid;
|
|
-
|
|
- b53_read64(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSTL_0_MACVID_65,
|
|
- &mac_vid);
|
|
- b53_arl_to_entry_25(ent, mac_vid);
|
|
-}
|
|
-
|
|
static void b53_arl_search_read_89(struct b53_device *dev, u8 idx,
|
|
struct b53_arl_entry *ent)
|
|
{
|
|
@@ -2730,12 +2720,6 @@ static const struct b53_arl_ops b53_arl_
|
|
.arl_search_read = b53_arl_search_read_25,
|
|
};
|
|
|
|
-static const struct b53_arl_ops b53_arl_ops_65 = {
|
|
- .arl_read_entry = b53_arl_read_entry_25,
|
|
- .arl_write_entry = b53_arl_write_entry_25,
|
|
- .arl_search_read = b53_arl_search_read_65,
|
|
-};
|
|
-
|
|
static const struct b53_arl_ops b53_arl_ops_89 = {
|
|
.arl_read_entry = b53_arl_read_entry_89,
|
|
.arl_write_entry = b53_arl_write_entry_89,
|
|
@@ -2798,7 +2782,7 @@ static const struct b53_chip_data b53_sw
|
|
.arl_buckets = 1024,
|
|
.imp_port = 5,
|
|
.duplex_reg = B53_DUPLEX_STAT_FE,
|
|
- .arl_ops = &b53_arl_ops_65,
|
|
+ .arl_ops = &b53_arl_ops_25,
|
|
},
|
|
{
|
|
.chip_id = BCM5389_DEVICE_ID,
|
|
--- a/drivers/net/dsa/b53/b53_regs.h
|
|
+++ b/drivers/net/dsa/b53/b53_regs.h
|
|
@@ -372,10 +372,8 @@
|
|
#define B53_ARL_SRCH_RSLT_MACVID_89 0x33
|
|
#define B53_ARL_SRCH_RSLT_MACVID_63XX 0x34
|
|
|
|
-/* Single register search result on 5325 */
|
|
+/* Single register search result on 5325/5365 */
|
|
#define B53_ARL_SRCH_RSTL_0_MACVID_25 0x24
|
|
-/* Single register search result on 5365 */
|
|
-#define B53_ARL_SRCH_RSTL_0_MACVID_65 0x30
|
|
|
|
/* ARL Search Data Result (32 bit) */
|
|
#define B53_ARL_SRCH_RSTL_0 0x68
|