cxgb4/cxgb4vf: check fw caps to set link mode mask

check firmware capabilities before setting ethtool
link mode mask, also add few missing speeds.

Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
index 7852d98..59d04d7 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
@@ -597,22 +597,22 @@ static void fw_caps_to_lmm(enum fw_port_type port_type,
 
        case FW_PORT_TYPE_KR:
                SET_LMM(Backplane);
-               SET_LMM(10000baseKR_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseKR_Full);
                break;
 
        case FW_PORT_TYPE_BP_AP:
                SET_LMM(Backplane);
-               SET_LMM(10000baseR_FEC);
-               SET_LMM(10000baseKR_Full);
-               SET_LMM(1000baseKX_Full);
+               FW_CAPS_TO_LMM(SPEED_1G, 1000baseKX_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseR_FEC);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseKR_Full);
                break;
 
        case FW_PORT_TYPE_BP4_AP:
                SET_LMM(Backplane);
-               SET_LMM(10000baseR_FEC);
-               SET_LMM(10000baseKR_Full);
-               SET_LMM(1000baseKX_Full);
-               SET_LMM(10000baseKX4_Full);
+               FW_CAPS_TO_LMM(SPEED_1G, 1000baseKX_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseR_FEC);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseKR_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseKX4_Full);
                break;
 
        case FW_PORT_TYPE_FIBER_XFI:
@@ -628,7 +628,9 @@ static void fw_caps_to_lmm(enum fw_port_type port_type,
        case FW_PORT_TYPE_BP40_BA:
        case FW_PORT_TYPE_QSFP:
                SET_LMM(FIBRE);
-               SET_LMM(40000baseSR4_Full);
+               FW_CAPS_TO_LMM(SPEED_1G, 1000baseT_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseT_Full);
+               FW_CAPS_TO_LMM(SPEED_40G, 40000baseSR4_Full);
                break;
 
        case FW_PORT_TYPE_CR_QSFP:
@@ -655,12 +657,14 @@ static void fw_caps_to_lmm(enum fw_port_type port_type,
 
        case FW_PORT_TYPE_CR2_QSFP:
                SET_LMM(FIBRE);
-               SET_LMM(50000baseSR2_Full);
+               FW_CAPS_TO_LMM(SPEED_50G, 50000baseSR2_Full);
                break;
 
        case FW_PORT_TYPE_KR4_100G:
        case FW_PORT_TYPE_CR4_QSFP:
                SET_LMM(FIBRE);
+               FW_CAPS_TO_LMM(SPEED_1G,  1000baseT_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseSR_Full);
                FW_CAPS_TO_LMM(SPEED_40G, 40000baseSR4_Full);
                FW_CAPS_TO_LMM(SPEED_25G, 25000baseCR_Full);
                FW_CAPS_TO_LMM(SPEED_50G, 50000baseCR2_Full);

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 361de86..7bd8497 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -1289,22 +1289,22 @@ static void fw_caps_to_lmm(enum fw_port_type port_type,
 
        case FW_PORT_TYPE_KR:
                SET_LMM(Backplane);
-               SET_LMM(10000baseKR_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseKR_Full);
                break;
 
        case FW_PORT_TYPE_BP_AP:
                SET_LMM(Backplane);
-               SET_LMM(10000baseR_FEC);
-               SET_LMM(10000baseKR_Full);
-               SET_LMM(1000baseKX_Full);
+               FW_CAPS_TO_LMM(SPEED_1G, 1000baseKX_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseR_FEC);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseKR_Full);
                break;
 
        case FW_PORT_TYPE_BP4_AP:
                SET_LMM(Backplane);
-               SET_LMM(10000baseR_FEC);
-               SET_LMM(10000baseKR_Full);
-               SET_LMM(1000baseKX_Full);
-               SET_LMM(10000baseKX4_Full);
+               FW_CAPS_TO_LMM(SPEED_1G, 1000baseKX_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseR_FEC);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseKR_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseKX4_Full);
                break;
 
        case FW_PORT_TYPE_FIBER_XFI:
@@ -1320,18 +1320,24 @@ static void fw_caps_to_lmm(enum fw_port_type port_type,
        case FW_PORT_TYPE_BP40_BA:
        case FW_PORT_TYPE_QSFP:
                SET_LMM(FIBRE);
-               SET_LMM(40000baseSR4_Full);
+               FW_CAPS_TO_LMM(SPEED_1G, 1000baseT_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseT_Full);
+               FW_CAPS_TO_LMM(SPEED_40G, 40000baseSR4_Full);
                break;
 
        case FW_PORT_TYPE_CR_QSFP:
        case FW_PORT_TYPE_SFP28:
                SET_LMM(FIBRE);
-               SET_LMM(25000baseCR_Full);
+               FW_CAPS_TO_LMM(SPEED_1G, 1000baseT_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseT_Full);
+               FW_CAPS_TO_LMM(SPEED_25G, 25000baseCR_Full);
                break;
 
        case FW_PORT_TYPE_KR_SFP28:
                SET_LMM(Backplane);
-               SET_LMM(25000baseKR_Full);
+               FW_CAPS_TO_LMM(SPEED_1G, 1000baseT_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseKR_Full);
+               FW_CAPS_TO_LMM(SPEED_25G, 25000baseKR_Full);
                break;
 
        case FW_PORT_TYPE_KR_XLAUI:
@@ -1343,13 +1349,18 @@ static void fw_caps_to_lmm(enum fw_port_type port_type,
 
        case FW_PORT_TYPE_CR2_QSFP:
                SET_LMM(FIBRE);
-               SET_LMM(50000baseSR2_Full);
+               FW_CAPS_TO_LMM(SPEED_50G, 50000baseSR2_Full);
                break;
 
        case FW_PORT_TYPE_KR4_100G:
        case FW_PORT_TYPE_CR4_QSFP:
                SET_LMM(FIBRE);
-               SET_LMM(100000baseCR4_Full);
+               FW_CAPS_TO_LMM(SPEED_1G,  1000baseT_Full);
+               FW_CAPS_TO_LMM(SPEED_10G, 10000baseSR_Full);
+               FW_CAPS_TO_LMM(SPEED_40G, 40000baseSR4_Full);
+               FW_CAPS_TO_LMM(SPEED_25G, 25000baseCR_Full);
+               FW_CAPS_TO_LMM(SPEED_50G, 50000baseCR2_Full);
+               FW_CAPS_TO_LMM(SPEED_100G, 100000baseCR4_Full);
                break;
 
        default: