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

[ Upstream commit a6e4fd38bf2f2e2363b61c27f4e6c49b14e4bb07 ]

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

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20251107080749.26936-2-jonas.gorski@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 8e46aacea426 ("net: dsa: b53: use same ARL search result offset for BCM5325/65")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index a09ed32dccc07126232ee0f0e464b5fd6db488c6..4d8de90fb4ab84ff1e6d45fcfdd1d25170f3467f 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1830,7 +1830,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);
@@ -1854,14 +1854,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;
@@ -1871,7 +1870,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);
@@ -1893,14 +1892,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;
@@ -1937,9 +1935,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)