mirror of
https://github.com/VIKINGYFY/immortalwrt.git
synced 2025-12-16 09:10:38 +00:00
cd75f703c2
These patches have been accepted for linux v6.18. e57723fe536f net: dsa: b53: properly bound ARL searches for < 4 ARL bin chips 674b34c4c770 net: dsa: b53: fix ageing time for BCM53101 89eb9a62aed7 net: dsa: b53: fix reserved register access in b53_fdb_dump() 61730ac10ba9 net: dsa: b53: mmap: Implement bcm63268 gphy power control 7f95f04fe190 net: dsa: b53: mmap: Add gphy port to phy info for bcm63268 5ac00023852d net: dsa: b53: mmap: Implement bcm63xx ephy power control e8e13073dff7 net: dsa: b53: mmap: Add register layout for bcm6368 c251304ab021 net: dsa: b53: mmap: Add register layout for bcm6318 aed2aaa3c963 net: dsa: b53: mmap: Add syscon reference and register layout for bcm63268 fcf02a462fab net: dsa: b53: Define chip IDs for more bcm63xx SoCs be7a79145d85 net: dsa: b53: Add phy_enable(), phy_disable() methods 762e7e174da9 net: dsa: tag_brcm: do not mark link local traffic as offloaded Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From e57723fe536f040cc2635ec1545dd0a7919a321e Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Date: Sun, 2 Nov 2025 11:07:58 +0100
|
|
Subject: [PATCH] net: dsa: b53: properly bound ARL searches for < 4 ARL bin
|
|
chips
|
|
|
|
When iterating over the ARL table we stop at max ARL entries / 2, but
|
|
this is only valid if the chip actually returns 2 results at once. For
|
|
chips with only one result register we will stop before reaching the end
|
|
of the table if it is more than half full.
|
|
|
|
Fix this by only dividing the maximum results by two if we have a chip
|
|
with more than one result register (i.e. those with 4 ARL bins).
|
|
|
|
Fixes: cd169d799bee ("net: dsa: b53: Bound check ARL searches")
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Link: https://patch.msgid.link/20251102100758.28352-4-jonas.gorski@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -2087,13 +2087,16 @@ static int b53_fdb_copy(int port, const
|
|
int b53_fdb_dump(struct dsa_switch *ds, int port,
|
|
dsa_fdb_dump_cb_t *cb, void *data)
|
|
{
|
|
+ unsigned int count = 0, results_per_hit = 1;
|
|
struct b53_device *priv = ds->priv;
|
|
struct b53_arl_entry results[2];
|
|
- unsigned int count = 0;
|
|
u8 offset;
|
|
int ret;
|
|
u8 reg;
|
|
|
|
+ if (priv->num_arl_bins > 2)
|
|
+ results_per_hit = 2;
|
|
+
|
|
mutex_lock(&priv->arl_mutex);
|
|
|
|
if (is5325(priv) || is5365(priv))
|
|
@@ -2115,7 +2118,7 @@ int b53_fdb_dump(struct dsa_switch *ds,
|
|
if (ret)
|
|
break;
|
|
|
|
- if (priv->num_arl_bins > 2) {
|
|
+ if (results_per_hit == 2) {
|
|
b53_arl_search_rd(priv, 1, &results[1]);
|
|
ret = b53_fdb_copy(port, &results[1], cb, data);
|
|
if (ret)
|
|
@@ -2125,7 +2128,7 @@ int b53_fdb_dump(struct dsa_switch *ds,
|
|
break;
|
|
}
|
|
|
|
- } while (count++ < b53_max_arl_entries(priv) / 2);
|
|
+ } while (count++ < b53_max_arl_entries(priv) / results_per_hit);
|
|
|
|
mutex_unlock(&priv->arl_mutex);
|
|
|