mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-03 10:10:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: dsa: microchip: Fix KSZ8863 reset problem

Browse source 
ksz8873_valid_regs[] was added for register access for KSZ8863/KSZ8873
switches, but the reset register is not in the list so
ksz8_reset_switch() does not take any effect.

Replace regmap_update_bits() using ksz_regmap_8 with ksz_rmw8() so that
an error message will be given if the register is not defined.

A side effect of not resetting the switch is the static MAC table is not
cleared.  Further additions to the table will show write error as there
are only 8 entries in the table.

Fixes: d0dec33330 ("net: dsa: microchip: Add register access control for KSZ8873 chip")
Signed-off-by: Tristram Ha <tristram.ha@microchip.com>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://patch.msgid.link/20250807005453.8306-1-Tristram.Ha@microchip.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Tristram Ha 2025-08-06 17:54:53 -07:00 committed by Jakub Kicinski
parent fd60d8a086
commit 829f45f9d9
2 changed files with 12 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/net/dsa/microchip/ksz8.c
View file

@ -36,15 +36,14 @@
static void ksz_cfg(struct ksz_device *dev, u32 addr, u8 bits, bool set) static void ksz_cfg(struct ksz_device *dev, u32 addr, u8 bits, bool set)
{ {
regmap_update_bits(ksz_regmap_8(dev), addr, bits, set ? bits : 0); ksz_rmw8(dev, addr, bits, set ? bits : 0);
} }
static void ksz_port_cfg(struct ksz_device *dev, int port, int offset, u8 bits, static void ksz_port_cfg(struct ksz_device *dev, int port, int offset, u8 bits,
bool set) bool set)
{ {
regmap_update_bits(ksz_regmap_8(dev), ksz_rmw8(dev, dev->dev_ops->get_port_addr(port, offset), bits,
dev->dev_ops->get_port_addr(port, offset), set ? bits : 0);
bits, set ? bits : 0);
} }
/** /**
@ -1955,16 +1954,19 @@ int ksz8_setup(struct dsa_switch *ds)
ksz_cfg(dev, S_LINK_AGING_CTRL, SW_LINK_AUTO_AGING, true); ksz_cfg(dev, S_LINK_AGING_CTRL, SW_LINK_AUTO_AGING, true);
/* Enable aggressive back off algorithm in half duplex mode. */ /* Enable aggressive back off algorithm in half duplex mode. */
regmap_update_bits(ksz_regmap_8(dev), REG_SW_CTRL_1, ret = ksz_rmw8(dev, REG_SW_CTRL_1, SW_AGGR_BACKOFF, SW_AGGR_BACKOFF);
SW_AGGR_BACKOFF, SW_AGGR_BACKOFF); if (ret)
return ret;
/* /*
* Make sure unicast VLAN boundary is set as default and * Make sure unicast VLAN boundary is set as default and
* enable no excessive collision drop. * enable no excessive collision drop.
*/ */
regmap_update_bits(ksz_regmap_8(dev), REG_SW_CTRL_2, ret = ksz_rmw8(dev, REG_SW_CTRL_2,
UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP, UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP,
UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP); UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP);
if (ret)
return ret;
ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_REPLACE_VID, false); ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_REPLACE_VID, false);

1
drivers/net/dsa/microchip/ksz_common.c
View file

@ -1447,6 +1447,7 @@ static const struct regmap_range ksz8873_valid_regs[] = {
regmap_reg_range(0x3f, 0x3f), regmap_reg_range(0x3f, 0x3f),
/* advanced control registers */ /* advanced control registers */
regmap_reg_range(0x43, 0x43),
regmap_reg_range(0x60, 0x6f), regmap_reg_range(0x60, 0x6f),
regmap_reg_range(0x70, 0x75), regmap_reg_range(0x70, 0x75),
regmap_reg_range(0x76, 0x78), regmap_reg_range(0x76, 0x78),