net: dsa: sja1105: Fix link speed not working at 100 Mbps and below

The hardware values for link speed are held in the sja1105_speed_t enum.
However they do not increase in the order that sja1105_get_speed_cfg was
iterating over them (basically from SJA1105_SPEED_AUTO - 0 - to
SJA1105_SPEED_1000MBPS - 1 - skipping the other two).

Another bug is that the code in sja1105_adjust_port_config relies on the
fact that an invalid link speed is detected by sja1105_get_speed_cfg and
returned as -EINVAL.  However storing this into an enum that only has
positive members will cast it into an unsigned value, and it will miss
the negative check.

So take the simplest approach and remove the sja1105_get_speed_cfg
function and replace it with a simple switch-case statement.

Fixes: 6772132ada66 ("net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch")
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 0663b78a2f6cdf112ff1ec98b4344d1bd88f3343..1c3959efebc4b2f7abc78131512c4563fb6a2221 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -652,16 +652,6 @@ static int sja1105_speed[] = {
        [SJA1105_SPEED_1000MBPS] = 1000,
 };
 
-static sja1105_speed_t sja1105_get_speed_cfg(unsigned int speed_mbps)
-{
-       int i;
-
-       for (i = SJA1105_SPEED_AUTO; i <= SJA1105_SPEED_1000MBPS; i++)
-               if (sja1105_speed[i] == speed_mbps)
-                       return i;
-       return -EINVAL;
-}
-
 /* Set link speed and enable/disable traffic I/O in the MAC configuration
  * for a specific port.
  *
@@ -684,8 +674,21 @@ static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,
        mii = priv->static_config.tables[BLK_IDX_XMII_PARAMS].entries;
        mac = priv->static_config.tables[BLK_IDX_MAC_CONFIG].entries;
 
-       speed = sja1105_get_speed_cfg(speed_mbps);
-       if (speed_mbps && speed < 0) {
+       switch (speed_mbps) {
+       case 0:
+               /* No speed update requested */
+               speed = SJA1105_SPEED_AUTO;
+               break;
+       case 10:
+               speed = SJA1105_SPEED_10MBPS;
+               break;
+       case 100:
+               speed = SJA1105_SPEED_100MBPS;
+               break;
+       case 1000:
+               speed = SJA1105_SPEED_1000MBPS;
+               break;
+       default:
                dev_err(dev, "Invalid speed %iMbps\n", speed_mbps);
                return -EINVAL;
        }
@@ -695,10 +698,7 @@ static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,
         * and we no longer need to store it in the static config (already told
         * hardware we want auto during upload phase).
         */
-       if (speed_mbps)
-               mac[port].speed = speed;
-       else
-               mac[port].speed = SJA1105_SPEED_AUTO;
+       mac[port].speed = speed;
 
        /* 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.