Skip to content

Commit 8a6be4b

Browse files
Danielmachonkuba-moo
authored andcommitted
net: sparx5: fix source port register when mirroring
When port mirroring is added to a port, the bit position of the source port, needs to be written to the register ANA_AC_PROBE_PORT_CFG. This register is replicated for n_ports > 32, and therefore we need to derive the correct register from the port number. Before this patch, we wrongly calculate the register from portno / BITS_PER_BYTE, where the divisor ought to be 32, causing any port >=8 to be written to the wrong register. We fix this, by using do_div(), where the dividend is the register, the remainder is the bit position and the divisor is now 32. Fixes: 4e50d72 ("net: sparx5: add port mirroring implementation") Signed-off-by: Daniel Machon <daniel.machon@microchip.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20241009-mirroring-fix-v1-1-9ec962301989@microchip.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 2260059 commit 8a6be4b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/net/ethernet/microchip/sparx5/sparx5_mirror.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ static u64 sparx5_mirror_port_get(struct sparx5 *sparx5, u32 idx)
3131
/* Add port to mirror (only front ports) */
3232
static void sparx5_mirror_port_add(struct sparx5 *sparx5, u32 idx, u32 portno)
3333
{
34-
u32 val, reg = portno;
34+
u64 reg = portno;
35+
u32 val;
3536

36-
reg = portno / BITS_PER_BYTE;
37-
val = BIT(portno % BITS_PER_BYTE);
37+
val = BIT(do_div(reg, 32));
3838

3939
if (reg == 0)
4040
return spx5_rmw(val, val, sparx5, ANA_AC_PROBE_PORT_CFG(idx));
@@ -45,10 +45,10 @@ static void sparx5_mirror_port_add(struct sparx5 *sparx5, u32 idx, u32 portno)
4545
/* Delete port from mirror (only front ports) */
4646
static void sparx5_mirror_port_del(struct sparx5 *sparx5, u32 idx, u32 portno)
4747
{
48-
u32 val, reg = portno;
48+
u64 reg = portno;
49+
u32 val;
4950

50-
reg = portno / BITS_PER_BYTE;
51-
val = BIT(portno % BITS_PER_BYTE);
51+
val = BIT(do_div(reg, 32));
5252

5353
if (reg == 0)
5454
return spx5_rmw(0, val, sparx5, ANA_AC_PROBE_PORT_CFG(idx));

0 commit comments

Comments
 (0)