net: dsa: sja1105: re-merge sja1105_set_port_speed() and sja1105_set_port_config()

Commit a18891b55703 ("net: dsa: sja1105: simplify static configuration
reload") split sja1105_mac_link_up() -> sja1105_adjust_port_config()
into two separate:

- sja1105_set_port_speed()
- sja1105_set_port_config()

in order to pick up the second sja1105_set_port_config() and reuse it
for the sja1105_static_config_reload() procedure which involves saving
and restoring MAC and PCS settings.

Now that these settings are restored by phylink itself, the driver no
longer needs to call its own sja1105_set_port_config(), and the
splitting is unnatural. Merge the functions back, which is to say that
the only supported internal code path is to submit the MAC Configuration
Table entry to hardware after phylink has dictated what we should set it
to.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20260119121954.1624535-5-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 3936d63f06454ce446e90f2606fd430dc7c548cd..2a4a0fe20dae762380efce078884328d31ceda2c 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -1260,7 +1260,9 @@ static int sja1105_set_port_speed(struct sja1105_private *priv, int port,
                                  int speed_mbps)
 {
        struct sja1105_mac_config_entry *mac;
+       struct device *dev = priv->ds->dev;
        u64 speed;
+       int rc;
 
        /* On P/Q/R/S, one can read from the device via the MAC reconfiguration
         * tables. On E/T, MAC reconfig tables are not readable, only writable.
@@ -1305,26 +1307,6 @@ static int sja1105_set_port_speed(struct sja1105_private *priv, int port,
         */
        mac[port].speed = speed;
 
-       return 0;
-}
-
-/* Write the MAC Configuration Table entry and, if necessary, the CGU settings,
- * after a link speedchange for this port.
- */
-static int sja1105_set_port_config(struct sja1105_private *priv, int port)
-{
-       struct sja1105_mac_config_entry *mac;
-       struct device *dev = priv->ds->dev;
-       int rc;
-
-       /* On P/Q/R/S, one can read from the device via the MAC reconfiguration
-        * tables. On E/T, MAC reconfig tables are not readable, only writable.
-        * We have to *know* what the MAC looks like.  For the sake of keeping
-        * the code common, we'll use the static configuration tables as a
-        * reasonable approximation for both E/T and P/Q/R/S.
-        */
-       mac = priv->static_config.tables[BLK_IDX_MAC_CONFIG].entries;
-
        /* Write to the dynamic reconfiguration tables */
        rc = sja1105_dynamic_config_write(priv, BLK_IDX_MAC_CONFIG, port,
                                          &mac[port], true);
@@ -1380,9 +1362,7 @@ static void sja1105_mac_link_up(struct phylink_config *config,
        struct sja1105_private *priv = dp->ds->priv;
        int port = dp->index;
 
-       if (!sja1105_set_port_speed(priv, port, speed))
-               sja1105_set_port_config(priv, port);
-
+       sja1105_set_port_speed(priv, port, speed);
        sja1105_inhibit_tx(priv, BIT(port), false);
 }