Commit 85132103 authored by Jonas Gorski's avatar Jonas Gorski Committed by Jakub Kicinski
Browse files

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: c4565538 ("net: dsa: b53: add support for FDB operations on 5325/5365")
Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20251128080625.27181-5-jonas.gorski@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8e46aace

drivers/net/dsa/b53/b53_priv.h

+9 −4
Original line number Diff line number Diff line
@@ -344,12 +344,14 @@ static inline void b53_arl_to_entry_25(struct b53_arl_entry *ent, 
				       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,6 +385,9 @@ static inline void b53_arl_from_entry_25(u64 *mac_vid, 
					 const struct b53_arl_entry *ent)

{

	*mac_vid = ether_addr_to_u64(ent->mac);

	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) <<