Commit 33623113 authored by Daniel Machon's avatar Daniel Machon Committed by Paolo Abeni
Browse files

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



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: 946e7fd5 ("net: sparx5: add port module support")
Signed-off-by: default avatarDaniel Machon <daniel.machon@microchip.com>
Reviewed-by: default avatarJacob 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: default avatarPaolo Abeni <pabeni@redhat.com>
parent fe87922c

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

+2 −2
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ static int sparx5_port_pcs_low_set(struct sparx5 *sparx5, 
	bool sgmii = false, inband_aneg = false;

	int err;



	if (port->conf.inband) {

	if (conf->inband) {

		if (conf->portmode == PHY_INTERFACE_MODE_SGMII ||

		    conf->portmode == PHY_INTERFACE_MODE_QSGMII)

			inband_aneg = true; /* Cisco-SGMII in-band-aneg */
@@ -948,7 +948,7 @@ int sparx5_port_pcs_set(struct sparx5 *sparx5, 
	if (err)

		return -EINVAL;



	if (port->conf.inband) {

	if (conf->inband) {

		/* Enable/disable 1G counters in ASM */

		spx5_rmw(ASM_PORT_CFG_CSC_STAT_DIS_SET(high_speed_dev),

			 ASM_PORT_CFG_CSC_STAT_DIS,