iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sparx5: fix wrong config being used when reconfiguring PCS

Browse Source 
[ Upstream commit 33623113a4 ]

The wrong port config is being used if the PCS is reconfigured. Fix this
by correctly using the new config instead of the old one.

Fixes: 946e7fd505 ("net: sparx5: add port module support")
Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20240409-link-mode-reconfiguration-fix-v2-1-db6a507f3627@microchip.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Daniel Machon
2024-04-09 12:41:59 +02:00
committed by Greg Kroah-Hartman
parent 292a764733
commit 54541e18ca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/microchip/sparx5/sparx5_port.c
View File

@ -731,7 +731,7 @@ static int sparx5_port_pcs_low_set(struct sparx5 *sparx5,
bool sgmii = false, inband_aneg = false; bool sgmii = false, inband_aneg = false;
int err; int err;
if (port->conf.inband) { if (conf->inband) {
if (conf->portmode == PHY_INTERFACE_MODE_SGMII || if (conf->portmode == PHY_INTERFACE_MODE_SGMII ||
conf->portmode == PHY_INTERFACE_MODE_QSGMII) conf->portmode == PHY_INTERFACE_MODE_QSGMII)
inband_aneg = true; /* Cisco-SGMII in-band-aneg */ inband_aneg = true; /* Cisco-SGMII in-band-aneg */
@ -948,7 +948,7 @@ int sparx5_port_pcs_set(struct sparx5 *sparx5,
if (err) if (err)
return -EINVAL; return -EINVAL;
if (port->conf.inband) { if (conf->inband) {
/* Enable/disable 1G counters in ASM */ /* Enable/disable 1G counters in ASM */
spx5_rmw(ASM_PORT_CFG_CSC_STAT_DIS_SET(high_speed_dev), spx5_rmw(ASM_PORT_CFG_CSC_STAT_DIS_SET(high_speed_dev),
ASM_PORT_CFG_CSC_STAT_DIS, ASM_PORT_CFG_CSC_STAT_DIS,