github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 23:22:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: dsa: b53: fix unicast/multicast flooding on BCM5325

Browse Source 
BCM5325 doesn't implement UC_FLOOD_MASK, MC_FLOOD_MASK and IPMC_FLOOD_MASK
registers.
This has to be handled differently with other pages and registers.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20250614080000.1884236-13-noltari@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Álvaro Fernández Rojas 2025-06-14 09:59:58 +02:00 committed by Jakub Kicinski
parent 37883bbc45
commit 651c9e71ff
2 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/net/dsa/b53/b53_common.c
View File

@ -560,12 +560,24 @@ static void b53_port_set_ucast_flood(struct b53_device *dev, int port,
{
u16 uc;
b53_read16(dev, B53_CTRL_PAGE, B53_UC_FLOOD_MASK, &uc);
if (unicast)
uc |= BIT(port);
else
uc &= ~BIT(port);
b53_write16(dev, B53_CTRL_PAGE, B53_UC_FLOOD_MASK, uc);
if (is5325(dev)) {
if (port == B53_CPU_PORT_25)
port = B53_CPU_PORT;
b53_read16(dev, B53_IEEE_PAGE, B53_IEEE_UCAST_DLF, &uc);
if (unicast)
uc |= BIT(port) | B53_IEEE_UCAST_DROP_EN;
else
uc &= ~BIT(port);
b53_write16(dev, B53_IEEE_PAGE, B53_IEEE_UCAST_DLF, uc);
} else {
b53_read16(dev, B53_CTRL_PAGE, B53_UC_FLOOD_MASK, &uc);
if (unicast)
uc |= BIT(port);
else
uc &= ~BIT(port);
b53_write16(dev, B53_CTRL_PAGE, B53_UC_FLOOD_MASK, uc);
}
}
static void b53_port_set_mcast_flood(struct b53_device *dev, int port,
@ -573,19 +585,31 @@ static void b53_port_set_mcast_flood(struct b53_device *dev, int port,
{
u16 mc;
b53_read16(dev, B53_CTRL_PAGE, B53_MC_FLOOD_MASK, &mc);
if (multicast)
mc |= BIT(port);
else
mc &= ~BIT(port);
b53_write16(dev, B53_CTRL_PAGE, B53_MC_FLOOD_MASK, mc);
if (is5325(dev)) {
if (port == B53_CPU_PORT_25)
port = B53_CPU_PORT;
b53_read16(dev, B53_CTRL_PAGE, B53_IPMC_FLOOD_MASK, &mc);
if (multicast)
mc |= BIT(port);
else
mc &= ~BIT(port);
b53_write16(dev, B53_CTRL_PAGE, B53_IPMC_FLOOD_MASK, mc);
b53_read16(dev, B53_IEEE_PAGE, B53_IEEE_MCAST_DLF, &mc);
if (multicast)
mc |= BIT(port) | B53_IEEE_MCAST_DROP_EN;
else
mc &= ~BIT(port);
b53_write16(dev, B53_IEEE_PAGE, B53_IEEE_MCAST_DLF, mc);
} else {
b53_read16(dev, B53_CTRL_PAGE, B53_MC_FLOOD_MASK, &mc);
if (multicast)
mc |= BIT(port);
else
mc &= ~BIT(port);
b53_write16(dev, B53_CTRL_PAGE, B53_MC_FLOOD_MASK, mc);
b53_read16(dev, B53_CTRL_PAGE, B53_IPMC_FLOOD_MASK, &mc);
if (multicast)
mc |= BIT(port);
else
mc &= ~BIT(port);
b53_write16(dev, B53_CTRL_PAGE, B53_IPMC_FLOOD_MASK, mc);
}
}
static void b53_port_set_learning(struct b53_device *dev, int port,

13
drivers/net/dsa/b53/b53_regs.h
View File

@ -29,6 +29,7 @@
#define B53_ARLIO_PAGE 0x05 /* ARL Access */
#define B53_FRAMEBUF_PAGE 0x06 /* Management frame access */
#define B53_MEM_ACCESS_PAGE 0x08 /* Memory access */
#define B53_IEEE_PAGE 0x0a /* IEEE 802.1X */
/* PHY Registers */
#define B53_PORT_MII_PAGE(i) (0x10 + (i)) /* Port i MII Registers */
@ -368,6 +369,18 @@
#define B53_ARL_SRCH_RSTL_MACVID(x) (B53_ARL_SRCH_RSTL_0_MACVID + ((x) * 0x10))
#define B53_ARL_SRCH_RSTL(x) (B53_ARL_SRCH_RSTL_0 + ((x) * 0x10))
/*************************************************************************
* IEEE 802.1X Registers
*************************************************************************/
/* Multicast DLF Drop Control register (16 bit) */
#define B53_IEEE_MCAST_DLF 0x94
#define B53_IEEE_MCAST_DROP_EN BIT(11)
/* Unicast DLF Drop Control register (16 bit) */
#define B53_IEEE_UCAST_DLF 0x96
#define B53_IEEE_UCAST_DROP_EN BIT(11)
/*************************************************************************
* Port VLAN Registers
*************************************************************************/