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

net: dsa: b53: b53_arl_read{,25}(): use the entry for comparision 



Align the b53_arl_read{,25}() functions by consistently using the
parsed arl entry instead of parsing the raw registers again.

Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20251107080749.26936-2-jonas.gorski@gmail.com


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

drivers/net/dsa/b53/b53_common.c

+10 −12
Original line number Diff line number Diff line
@@ -1850,7 +1850,7 @@ static int b53_arl_rw_op(struct b53_device *dev, unsigned int op) 
	return b53_arl_op_wait(dev);

}



static int b53_arl_read(struct b53_device *dev, u64 mac,

static int b53_arl_read(struct b53_device *dev, const u8 *mac,

			u16 vid, struct b53_arl_entry *ent, u8 *idx)

{

	DECLARE_BITMAP(free_bins, B53_ARLTBL_MAX_BIN_ENTRIES);
@@ -1874,14 +1874,13 @@ static int b53_arl_read(struct b53_device *dev, u64 mac, 
			   B53_ARLTBL_DATA_ENTRY(i), &fwd_entry);

		b53_arl_to_entry(ent, mac_vid, fwd_entry);



		if (!(fwd_entry & ARLTBL_VALID)) {

		if (!ent->is_valid) {

			set_bit(i, free_bins);

			continue;

		}

		if ((mac_vid & ARLTBL_MAC_MASK) != mac)

		if (!ether_addr_equal(ent->mac, mac))

			continue;

		if (dev->vlan_enabled &&

		    ((mac_vid >> ARLTBL_VID_S) & ARLTBL_VID_MASK) != vid)

		if (dev->vlan_enabled && ent->vid != vid)

			continue;

		*idx = i;

		return 0;
@@ -1891,7 +1890,7 @@ static int b53_arl_read(struct b53_device *dev, u64 mac, 
	return *idx >= dev->num_arl_bins ? -ENOSPC : -ENOENT;

}



static int b53_arl_read_25(struct b53_device *dev, u64 mac,

static int b53_arl_read_25(struct b53_device *dev, const u8 *mac,

			   u16 vid, struct b53_arl_entry *ent, u8 *idx)

{

	DECLARE_BITMAP(free_bins, B53_ARLTBL_MAX_BIN_ENTRIES);
@@ -1913,14 +1912,13 @@ static int b53_arl_read_25(struct b53_device *dev, u64 mac, 


		b53_arl_to_entry_25(ent, mac_vid);



		if (!(mac_vid & ARLTBL_VALID_25)) {

		if (!ent->is_valid) {

			set_bit(i, free_bins);

			continue;

		}

		if ((mac_vid & ARLTBL_MAC_MASK) != mac)

		if (!ether_addr_equal(ent->mac, mac))

			continue;

		if (dev->vlan_enabled &&

		    ((mac_vid >> ARLTBL_VID_S_65) & ARLTBL_VID_MASK_25) != vid)

		if (dev->vlan_enabled && ent->vid != vid)

			continue;

		*idx = i;

		return 0;
@@ -1953,9 +1951,9 @@ static int b53_arl_op(struct b53_device *dev, int op, int port, 
		return ret;



	if (is5325(dev) || is5365(dev))

		ret = b53_arl_read_25(dev, mac, vid, &ent, &idx);

		ret = b53_arl_read_25(dev, addr, vid, &ent, &idx);

	else

		ret = b53_arl_read(dev, mac, vid, &ent, &idx);

		ret = b53_arl_read(dev, addr, vid, &ent, &idx);



	/* If this is a read, just finish now */

	if (op)