zhao
b34543084f
All checks were successful
target_linux_generic / Update target_linux_generic (openwrt-25.12) (push) Successful in 8s
52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
From 85132103f700b1340fc17df8a981509d17bf4872 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Date: Fri, 28 Nov 2025 09:06:22 +0100
|
|
Subject: [PATCH] net: dsa: b53: fix CPU port unicast ARL entries for BCM5325/65
|
|
|
|
On BCM5325 and BCM5365, unicast ARL entries use 8 as the value for the
|
|
CPU port, so we need to translate it to/from 5 as used for the CPU port
|
|
at most other places.
|
|
|
|
Fixes: c45655386e53 ("net: dsa: b53: add support for FDB operations on 5325/5365")
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Link: https://patch.msgid.link/20251128080625.27181-5-jonas.gorski@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/b53/b53_priv.h | 13 +++++++++----
|
|
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_priv.h
|
|
+++ b/drivers/net/dsa/b53/b53_priv.h
|
|
@@ -344,12 +344,14 @@ static inline void b53_arl_to_entry_25(s
|
|
u64 mac_vid)
|
|
{
|
|
memset(ent, 0, sizeof(*ent));
|
|
- ent->port = (mac_vid >> ARLTBL_DATA_PORT_ID_S_25) &
|
|
- ARLTBL_DATA_PORT_ID_MASK_25;
|
|
ent->is_valid = !!(mac_vid & ARLTBL_VALID_25);
|
|
ent->is_age = !!(mac_vid & ARLTBL_AGE_25);
|
|
ent->is_static = !!(mac_vid & ARLTBL_STATIC_25);
|
|
u64_to_ether_addr(mac_vid, ent->mac);
|
|
+ ent->port = (mac_vid >> ARLTBL_DATA_PORT_ID_S_25) &
|
|
+ ARLTBL_DATA_PORT_ID_MASK_25;
|
|
+ if (is_unicast_ether_addr(ent->mac) && ent->port == B53_CPU_PORT)
|
|
+ ent->port = B53_CPU_PORT_25;
|
|
ent->vid = (mac_vid >> ARLTBL_VID_S_65) & ARLTBL_VID_MASK_25;
|
|
}
|
|
|
|
@@ -383,8 +385,11 @@ static inline void b53_arl_from_entry_25
|
|
const struct b53_arl_entry *ent)
|
|
{
|
|
*mac_vid = ether_addr_to_u64(ent->mac);
|
|
- *mac_vid |= (u64)(ent->port & ARLTBL_DATA_PORT_ID_MASK_25) <<
|
|
- ARLTBL_DATA_PORT_ID_S_25;
|
|
+ if (is_unicast_ether_addr(ent->mac) && ent->port == B53_CPU_PORT_25)
|
|
+ *mac_vid |= (u64)B53_CPU_PORT << ARLTBL_DATA_PORT_ID_S_25;
|
|
+ else
|
|
+ *mac_vid |= (u64)(ent->port & ARLTBL_DATA_PORT_ID_MASK_25) <<
|
|
+ ARLTBL_DATA_PORT_ID_S_25;
|
|
*mac_vid |= (u64)(ent->vid & ARLTBL_VID_MASK_25) <<
|
|
ARLTBL_VID_S_65;
|
|
if (ent->is_valid)
|