i40e: Fix reporting of supported link modes

This patch fixes incorrect reporting of supported link modes on some NICs.

Signed-off-by: Filip Sadowski <filip.sadowski@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index 7346d8850c8e..64c15f4c9d2b 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -1821,7 +1821,7 @@ i40e_status i40e_aq_get_link_info(struct i40e_hw *hw,
         hw_link_info->fec_info = resp->config & (I40E_AQ_CONFIG_FEC_KR_ENA |
                                                  I40E_AQ_CONFIG_FEC_RS_ENA);
         hw_link_info->ext_info = resp->ext_info;
-        hw_link_info->loopback = resp->loopback;
+        hw_link_info->loopback = resp->loopback & I40E_AQ_LOOPBACK_MASK;
         hw_link_info->max_frame_size = le16_to_cpu(resp->max_frame_size);
         hw_link_info->pacing = resp->config & I40E_AQ_CONFIG_PACING_MASK;
 
@@ -1852,6 +1852,15 @@ i40e_status i40e_aq_get_link_info(struct i40e_hw *hw,
              hw->aq.fw_min_ver < 40)) && hw_link_info->phy_type == 0xE)
                 hw_link_info->phy_type = I40E_PHY_TYPE_10GBASE_SFPP_CU;
 
+        if (hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&
+            hw->aq.api_min_ver >= 7) {
+                __le32 tmp;
+
+                memcpy(&tmp, resp->link_type, sizeof(tmp));
+                hw->phy.phy_types = le32_to_cpu(tmp);
+                hw->phy.phy_types |= ((u64)resp->link_type_ext << 32);
+        }
+
         /* save link status information */
         if (link)
                 *link = *hw_link_info;