aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_common.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_common.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index f42a954ef660..79533e2720f9 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -1755,17 +1755,24 @@ s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw)
1755 /* 1755 /*
1756 * On backplane, bail out if 1756 * On backplane, bail out if
1757 * - backplane autoneg was not completed, or if 1757 * - backplane autoneg was not completed, or if
1758 * - link partner is not AN enabled 1758 * - we are 82599 and link partner is not AN enabled
1759 */ 1759 */
1760 if (hw->phy.media_type == ixgbe_media_type_backplane) { 1760 if (hw->phy.media_type == ixgbe_media_type_backplane) {
1761 links = IXGBE_READ_REG(hw, IXGBE_LINKS); 1761 links = IXGBE_READ_REG(hw, IXGBE_LINKS);
1762 links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2); 1762 if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {
1763 if (((links & IXGBE_LINKS_KX_AN_COMP) == 0) ||
1764 ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0)) {
1765 hw->fc.fc_was_autonegged = false; 1763 hw->fc.fc_was_autonegged = false;
1766 hw->fc.current_mode = hw->fc.requested_mode; 1764 hw->fc.current_mode = hw->fc.requested_mode;
1767 goto out; 1765 goto out;
1768 } 1766 }
1767
1768 if (hw->mac.type == ixgbe_mac_82599EB) {
1769 links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);
1770 if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {
1771 hw->fc.fc_was_autonegged = false;
1772 hw->fc.current_mode = hw->fc.requested_mode;
1773 goto out;
1774 }
1775 }
1769 } 1776 }
1770 1777
1771 /* 1778 /*