Commit 976703ca authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: dsa: sja1105: reorder sja1105_reload_cbs() and phylink_replay_link_end() 



Move phylink_replay_link_end() as the last locked operation under
sja1105_static_config_reload(). The purpose is to be able to goto
this step from the error path of intermediate steps (we must call
phylink_replay_link_end()).

sja1105_reload_cbs() notably does not depend on port states or link
speeds. See commit 954ad9bf ("net: dsa: sja1105: fix bandwidth
discrepancy between tc-cbs software and offload") which has discussed
this issue specifically.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20260304220900.3865120-2-vladimir.oltean@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0cc0c2e6

drivers/net/dsa/sja1105/sja1105_main.c

+2 −4
Original line number Diff line number Diff line
@@ -2339,13 +2339,11 @@ int sja1105_static_config_reload(struct sja1105_private *priv, 
			goto out;

	}



	rc = sja1105_reload_cbs(priv);



	dsa_switch_for_each_available_port(dp, ds)

		if (dp->pl)

			phylink_replay_link_end(dp->pl);



	rc = sja1105_reload_cbs(priv);

	if (rc < 0)

		goto out;

out:

	mutex_unlock(&priv->mgmt_lock);

	mutex_unlock(&priv->fdb_lock);