Fix link speed handling for SJA1105 DSA driver
Vladimir Oltean
maintainerv2 cover Fix link speed handling for SJA1105 DSA driver
This patchset avoids two bugs in the logic handling of the enum sja1105_speed_t which caused link speeds of 10 and 100 Mbps to not be interpreted correctly and thus not be applied to the switch MACs.
v1 patchset can be found at:
https://www.spinics.net/lists/netdev/msg574477.html
Changes from v1:
Applied Andrew Lunn's suggestion of removing the sja1105_get_speed_cfg function altogether instead of trying to fix it.
Vladimir Oltean (1):
net: dsa: sja1105: Fix link speed not working at 100 Mbps and below
drivers/net/dsa/sja1105/sja1105_main.c | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-)
Signature · 1 line
2.17.1
Vladimir Oltean
maintainerPATCH v2 1/1 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.
--- drivers/net/dsa/sja1105/sja1105_main.c | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/net/dsa/sja1105/sja1105_main.c +16 -16
@@ -710,16 +710,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. *
@@ -742,8 +732,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 ; }
@@ -753,10 +756,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.
Signature · 1 line
2.17.1
Re: [PATCH v2 net 1/1] net: dsa: sja1105: Fix link speed not working at 100 Mbps and below
Quoted 56 lines · Vladimir Oltean
The hardware values for link speed are held in the
sja1105_speed_tenum. However they do not increase in the order thatsja1105_get_speed_cfgwas iterating over them (basically fromSJA1105_SPEED_AUTO- 0 - toSJA1105_SPEED_1000MBPS- 1 - skipping the other two).Another bug is that the code in
sja1105_adjust_port_configrelies on the fact that an invalid link speed is detected bysja1105_get_speed_cfgand 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_cfgfunction and replace it with a simple switch-case statement.Fixes 8aa9ebccae87 ("net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch")Signed-off-by Vladimir Oltean <[email protected]>Suggested-by Andrew Lunn <[email protected]>--- drivers/net/dsa/sja1105/sja1105_main.c | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-)drivers/net/dsa/sja1105/sja1105_main.c +8
-12@@ -710,16 +710,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. * @@ -742,8 +732,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 ;
drivers/net/dsa/sja1105/sja1105_main.c static int sja1105_adjust_port_config(struct sja1105_private *priv, int port, · line 752
Quoted 10 lines
drivers/net/dsa/sja1105/sja1105_main.c +7
-0+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 ; }
Thanks for the re-write. This looks more obviously correct. One minor nit-pick. We have SPEED_10, SPEED_100, SPEED_1000, etc. It would be good to use them.
With that change
Andrew
Vladimir Oltean
maintainerRe: [PATCH v2 net 1/1] net: dsa: sja1105: Fix link speed not working at 100 Mbps and below
Quoted 73 lines · Andrew Lunn
Quoted 56 lines · Vladimir Oltean
The hardware values for link speed are held in the
sja1105_speed_tenum. However they do not increase in the order thatsja1105_get_speed_cfgwas iterating over them (basically fromSJA1105_SPEED_AUTO- 0 - toSJA1105_SPEED_1000MBPS- 1 - skipping the other two).Another bug is that the code in
sja1105_adjust_port_configrelies on the fact that an invalid link speed is detected bysja1105_get_speed_cfgand 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_cfgfunction and replace it with a simple switch-case statement.Fixes 8aa9ebccae87 ("net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch")Signed-off-by Vladimir Oltean <[email protected]>Suggested-by Andrew Lunn <[email protected]>--- drivers/net/dsa/sja1105/sja1105_main.c | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-)drivers/net/dsa/sja1105/sja1105_main.c +8
-12@@ -710,16 +710,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. * @@ -742,8 +732,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 ;drivers/net/dsa/sja1105/sja1105_main.c static int sja1105_adjust_port_config(struct sja1105_private *priv, int port, · line 752
Quoted 10 lines
drivers/net/dsa/sja1105/sja1105_main.c +7
-0+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 ; }Thanks for the re-write. This looks more obviously correct. One minor nit-pick. We have
SPEED_10,SPEED_100,SPEED_1000, etc. It would be good to use them.
Quoted 5 lines
With that change
Reviewed-by Andrew Lunn <[email protected]>Andrew
Hi Andrew,
If I made the change you're suggesting, I would need to replace 0 with SPEED_UNKNOWN and thus I would conflict with this net-next change:
I think it's simpler to wait until Dave merges net into net-next and then submit this 1000 -> SPEED_1000 change as a net-next one, and let the fix itself go into net.
Sounds ok?
Regards,
-Vladimir
Andrew Lunn
maintainerRe: [PATCH v2 net 1/1] net: dsa: sja1105: Fix link speed not working at 100 Mbps and below
Quoted 11 lines
Hi Andrew,
If I made the change you're suggesting, I would need to replace 0 with
SPEED_UNKNOWNand thus I would conflict with this net-next change:I think it's simpler to wait until Dave merges net into net-next and then submit this 1000 ->
SPEED_1000change as a net-next one, and let the fix itself go into net.
Sounds ok?
Fine.
Andrew
Re: [PATCH v2 net 1/1] net: dsa: sja1105: Fix link speed not working at 100 Mbps and below
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Date: Mon, 3 Jun 2019 02:31:37 +0300
Quoted 11 lines
The hardware values for link speed are held in the
sja1105_speed_tenum. However they do not increase in the order thatsja1105_get_speed_cfgwas iterating over them (basically fromSJA1105_SPEED_AUTO- 0 - toSJA1105_SPEED_1000MBPS- 1 - skipping the other two).Another bug is that the code in
sja1105_adjust_port_configrelies on the fact that an invalid link speed is detected bysja1105_get_speed_cfgand 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.
Quoted 6 lines
So take the simplest approach and remove the
sja1105_get_speed_cfgfunction and replace it with a simple switch-case statement.Fixes 8aa9ebccae87 ("net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch")Signed-off-by Vladimir Oltean <[email protected]>Suggested-by Andrew Lunn <[email protected]>
Applied.