be2net: add speed reporting for 20G-KR interface

This patch adds speed reporting via ethtool for 20G KR2 interface on the
Skyhawk-R chip.

Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index b064c50..eb5085d 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -1374,6 +1374,7 @@ enum {
 #define BE_SUPPORTED_SPEED_100MBPS     2
 #define BE_SUPPORTED_SPEED_1GBPS       4
 #define BE_SUPPORTED_SPEED_10GBPS      8
+#define BE_SUPPORTED_SPEED_20GBPS      0x10
 #define BE_SUPPORTED_SPEED_40GBPS      0x20
 
 #define BE_AN_EN                       0x2

diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 8297824..ec66f64 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -534,6 +534,13 @@ static u32 convert_to_et_setting(struct be_adapter *adapter, u32 if_speeds)
                if (if_speeds & BE_SUPPORTED_SPEED_10GBPS)
                        val |= SUPPORTED_10000baseKX4_Full;
                break;
+       case PHY_TYPE_KR2_20GB:
+               val |= SUPPORTED_Backplane;
+               if (if_speeds & BE_SUPPORTED_SPEED_10GBPS)
+                       val |= SUPPORTED_10000baseKR_Full;
+               if (if_speeds & BE_SUPPORTED_SPEED_20GBPS)
+                       val |= SUPPORTED_20000baseKR2_Full;
+               break;
        case PHY_TYPE_KR_10GB:
                val |= SUPPORTED_Backplane |
                                SUPPORTED_10000baseKR_Full;