Merge tag 'mlx5-updates-2019-02-19' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux

Saeed Mahameed says:

====================
mlx5-updates-2019-02-19

This series includes misc updates to mlx5 drivers and one ethtool update.

1) From Aya Levin:
   - ethtool: Define 50Gbps per lane link modes
   - add support for 50Gbps per lane link modes in mlx5 driver

2) From Tariq Toukan,
   - Add a helper function to unify mlx5 resource reloading

3) From Vlad Buslov,
   - Remove wrong and superfluous tc pedit header type check

4) From Tonghao Zhang,
   - Some refactoring in en_tc.c to simplify the mlx5e_tc_add_fdb_flow

5) From Leon Romanovsky & Saeed,
   - Compilation warning fixes

6) From Bodong wang,
   - E-Switch fixes that are related to the SmarNIC series
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 17 insertions, 1 deletions

diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 17be76aeb468..378c52308d89 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -1453,6 +1453,21 @@ enum ethtool_link_mode_bit_indices {
         ETHTOOL_LINK_MODE_FEC_NONE_BIT  = 49,
         ETHTOOL_LINK_MODE_FEC_RS_BIT    = 50,
         ETHTOOL_LINK_MODE_FEC_BASER_BIT = 51,
+        ETHTOOL_LINK_MODE_50000baseKR_Full_BIT           = 52,
+        ETHTOOL_LINK_MODE_50000baseSR_Full_BIT           = 53,
+        ETHTOOL_LINK_MODE_50000baseCR_Full_BIT           = 54,
+        ETHTOOL_LINK_MODE_50000baseLR_ER_FR_Full_BIT     = 55,
+        ETHTOOL_LINK_MODE_50000baseDR_Full_BIT           = 56,
+        ETHTOOL_LINK_MODE_100000baseKR2_Full_BIT         = 57,
+        ETHTOOL_LINK_MODE_100000baseSR2_Full_BIT         = 58,
+        ETHTOOL_LINK_MODE_100000baseCR2_Full_BIT         = 59,
+        ETHTOOL_LINK_MODE_100000baseLR2_ER2_FR2_Full_BIT = 60,
+        ETHTOOL_LINK_MODE_100000baseDR2_Full_BIT         = 61,
+        ETHTOOL_LINK_MODE_200000baseKR4_Full_BIT         = 62,
+        ETHTOOL_LINK_MODE_200000baseSR4_Full_BIT         = 63,
+        ETHTOOL_LINK_MODE_200000baseLR4_ER4_FR4_Full_BIT = 64,
+        ETHTOOL_LINK_MODE_200000baseDR4_Full_BIT         = 65,
+        ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT         = 66,
 
         /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
          * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*
@@ -1461,7 +1476,7 @@ enum ethtool_link_mode_bit_indices {
          */
 
         __ETHTOOL_LINK_MODE_LAST
-          = ETHTOOL_LINK_MODE_FEC_BASER_BIT,
+          = ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT,
 };
 
 #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name)      \
@@ -1569,6 +1584,7 @@ enum ethtool_link_mode_bit_indices {
 #define SPEED_50000             50000
 #define SPEED_56000             56000
 #define SPEED_100000            100000
+#define SPEED_200000            200000
 
 #define SPEED_UNKNOWN           -1