i40e/base: get link status to report flow control settings

The fix is to use get_link_status but not get_phy_capabilities
for reporting FC settings.

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
Reviewed-by: Chen Jing <jing.d.chen@intel.com>
Tested-by: HuilongX Xu <huilongx.xu@intel.com>

diff --git a/lib/librte_pmd_i40e/i40e/i40e_common.c b/lib/librte_pmd_i40e/i40e/i40e_common.c
index e82411a..0992860 100644 (file)
--- a/lib/librte_pmd_i40e/i40e/i40e_common.c
+++ b/lib/librte_pmd_i40e/i40e/i40e_common.c
@@ -1200,7 +1200,7 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,
        status = i40e_aq_get_phy_capabilities(hw, false, false, &abilities,
                                              NULL);
        if (status) {
-               *aq_failures |= I40E_SET_FC_AQ_FAIL_GET1;
+               *aq_failures |= I40E_SET_FC_AQ_FAIL_GET;
                return status;
        }
 
@@ -1225,31 +1225,19 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,
 
                if (status)
                        *aq_failures |= I40E_SET_FC_AQ_FAIL_SET;
-
-               /* Get the abilities to set hw->fc.current_mode correctly */
-               status = i40e_aq_get_phy_capabilities(hw, false, false,
-                                                     &abilities, NULL);
-               if (status) {
-                       /* Wait a little bit and try once more */
-                       i40e_msec_delay(1000);
-                       status = i40e_aq_get_phy_capabilities(hw, false, false,
-                                                             &abilities, NULL);
-               }
-               if (status) {
-                       *aq_failures |= I40E_SET_FC_AQ_FAIL_GET2;
-                       return status;
-               }
        }
-       /* Copy the what was returned from get capabilities into fc */
-       if ((abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_TX) &&
-           (abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_RX))
-               hw->fc.current_mode = I40E_FC_FULL;
-       else if (abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_TX)
-               hw->fc.current_mode = I40E_FC_TX_PAUSE;
-       else if (abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_RX)
-               hw->fc.current_mode = I40E_FC_RX_PAUSE;
-       else
-               hw->fc.current_mode = I40E_FC_NONE;
+       /* Update the link info */
+       status = i40e_update_link_info(hw, true);
+       if (status) {
+               /* Wait a little bit (on 40G cards it sometimes takes a really
+                * long time for link to come back from the atomic reset)
+                * and try once more
+                */
+               i40e_msec_delay(1000);
+               status = i40e_update_link_info(hw, true);
+       }
+       if (status)
+               *aq_failures |= I40E_SET_FC_AQ_FAIL_UPDATE;
 
        return status;
 }

diff --git a/lib/librte_pmd_i40e/i40e/i40e_type.h b/lib/librte_pmd_i40e/i40e/i40e_type.h
index 004967a..1b3ae65 100644 (file)
--- a/lib/librte_pmd_i40e/i40e/i40e_type.h
+++ b/lib/librte_pmd_i40e/i40e/i40e_type.h
@@ -67,8 +67,10 @@ POSSIBILITY OF SUCH DAMAGE.
                                         (d) == I40E_DEV_ID_QSFP_B  || \
                                         (d) == I40E_DEV_ID_QSFP_C)
 
+#ifndef I40E_MASK
 /* I40E_MASK is a macro used on 32 bit registers */
 #define I40E_MASK(mask, shift) (mask << shift)
+#endif
 
 #define I40E_MAX_PF                    16
 #define I40E_MAX_PF_VSI                        64
@@ -215,10 +217,10 @@ enum i40e_fc_mode {
 
 enum i40e_set_fc_aq_failures {
        I40E_SET_FC_AQ_FAIL_NONE = 0,
-       I40E_SET_FC_AQ_FAIL_GET1 = 1,
+       I40E_SET_FC_AQ_FAIL_GET = 1,
        I40E_SET_FC_AQ_FAIL_SET = 2,
-       I40E_SET_FC_AQ_FAIL_GET2 = 4,
-       I40E_SET_FC_AQ_FAIL_SET_GET = 6
+       I40E_SET_FC_AQ_FAIL_UPDATE = 4,
+       I40E_SET_FC_AQ_FAIL_SET_UPDATE = 6
 };
 
 enum i40e_vsi_type {