[PATCH v2 net-next 4/6] net: dsa: felix: set proper pause frame timers based on link speed

[Vladimir Oltean]

From: Vladimir Oltean <vladimir.olt...@nxp.com>

state->speed holds a value of 10, 100, 1000 or 2500, but
SYS_MAC_FC_CFG_FC_LINK_SPEED expects a value in the range 0, 1, 2 or 3.

So set the correct speed encoding into this register.

Signed-off-by: Vladimir Oltean <vladimir.olt...@nxp.com>
---
Changes in v2:
None.

Note: this patch is still using state->speed from mac_config(), although
that will be changed in 6/6.

 drivers/net/dsa/ocelot/felix.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 4d819cc45bed..4684339012c5 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -250,10 +250,25 @@ static void felix_phylink_mac_config(struct dsa_switch 
*ds, int port,
                           DEV_CLOCK_CFG_LINK_SPEED(OCELOT_SPEED_1000),
                           DEV_CLOCK_CFG);
 
-       /* Flow control. Link speed is only used here to evaluate the time
-        * specification in incoming pause frames.
-        */
-       mac_fc_cfg = SYS_MAC_FC_CFG_FC_LINK_SPEED(state->speed);
+       switch (state->speed) {
+       case SPEED_10:
+               mac_fc_cfg = SYS_MAC_FC_CFG_FC_LINK_SPEED(3);
+               break;
+       case SPEED_100:
+               mac_fc_cfg = SYS_MAC_FC_CFG_FC_LINK_SPEED(2);
+               break;
+       case SPEED_1000:
+       case SPEED_2500:
+               mac_fc_cfg = SYS_MAC_FC_CFG_FC_LINK_SPEED(1);
+               break;
+       case SPEED_UNKNOWN:
+               mac_fc_cfg = SYS_MAC_FC_CFG_FC_LINK_SPEED(0);
+               break;
+       default:
+               dev_err(ocelot->dev, "Unsupported speed on port %d: %d\n",
+                       port, state->speed);
+               return;
+       }
 
        /* handle Rx pause in all cases, with 2500base-X this is used for rate
         * adaptation.
@@ -265,6 +280,10 @@ static void felix_phylink_mac_config(struct dsa_switch 
*ds, int port,
                              SYS_MAC_FC_CFG_PAUSE_VAL_CFG(0xffff) |
                              SYS_MAC_FC_CFG_FC_LATENCY_CFG(0x7) |
                              SYS_MAC_FC_CFG_ZERO_PAUSE_ENA;
+
+       /* Flow control. Link speed is only used here to evaluate the time
+        * specification in incoming pause frames.
+        */
        ocelot_write_rix(ocelot, mac_fc_cfg, SYS_MAC_FC_CFG, port);
 
        ocelot_write_rix(ocelot, 0, ANA_POL_FLOWC, port);
-- 
2.25.1