net/mlx5e: Set FEC to auto when configured mode is not supported

When configuring FEC mode, driver tries to set it for all available
link types. If a link type doesn't support a FEC mode, set this link
type to auto (FW best effort). Prior to this patch, when a link type
didn't support a FEC mode is was set to no FEC.

Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/port.c b/drivers/net/ethernet/mellanox/mlx5/core/en/port.c
index fce6eccdcf8b2f3337655ddf26f634f465005e01..f0dc0ca3ddc4b62b771fc3d1270fc13899b2564c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/port.c
@@ -501,8 +501,6 @@ int mlx5e_get_fec_mode(struct mlx5_core_dev *dev, u32 *fec_mode_active,
 
 int mlx5e_set_fec_mode(struct mlx5_core_dev *dev, u8 fec_policy)
 {
-       u8 fec_policy_nofec = BIT(MLX5E_FEC_NOFEC);
-       bool fec_mode_not_supp_in_speed = false;
        u32 out[MLX5_ST_SZ_DW(pplm_reg)] = {};
        u32 in[MLX5_ST_SZ_DW(pplm_reg)] = {};
        int sz = MLX5_ST_SZ_BYTES(pplm_reg);
@@ -526,23 +524,15 @@ int mlx5e_set_fec_mode(struct mlx5_core_dev *dev, u8 fec_policy)
 
        for (i = 0; i < MLX5E_FEC_SUPPORTED_SPEEDS; i++) {
                mlx5e_get_fec_cap_field(out, &fec_caps, fec_supported_speeds[i]);
-               /* policy supported for link speed, or policy is auto */
-               if (fec_caps & fec_policy || fec_policy == fec_policy_auto) {
+               /* policy supported for link speed */
+               if (fec_caps & fec_policy)
                        mlx5e_fec_admin_field(out, &fec_policy, 1,
                                              fec_supported_speeds[i]);
-               } else {
-                       /* turn off FEC if supported. Else, leave it the same */
-                       if (fec_caps & fec_policy_nofec)
-                               mlx5e_fec_admin_field(out, &fec_policy_nofec, 1,
-                                                     fec_supported_speeds[i]);
-                       fec_mode_not_supp_in_speed = true;
-               }
+               else
+                       /* set FEC to auto*/
+                       mlx5e_fec_admin_field(out, &fec_policy_auto, 1,
+                                             fec_supported_speeds[i]);
        }
 
-       if (fec_mode_not_supp_in_speed)
-               mlx5_core_dbg(dev,
-                             "FEC policy 0x%x is not supported for some speeds",
-                             fec_policy);
-
        return mlx5_core_access_reg(dev, out, sz, out, sz, MLX5_REG_PPLM, 0, 1);
 }