Commit 000c486d authored by Don Skidmore's avatar Don Skidmore Committed by David S. Miller
Browse files

ixgbe: LINKS2 is not a valid register for 82598 



82598 shouldn't try and access LINKS2 while configuring
link and flow control.  This is an 82599-only register.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9bbe3a57

drivers/net/ixgbe/ixgbe_common.c

+11 −4
Original line number Diff line number Diff line
@@ -1755,18 +1755,25 @@ s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw) 
	/*

	 * On backplane, bail out if

	 * - backplane autoneg was not completed, or if

	 * - link partner is not AN enabled

	 * - we are 82599 and link partner is not AN enabled

	 */

	if (hw->phy.media_type == ixgbe_media_type_backplane) {

		links = IXGBE_READ_REG(hw, IXGBE_LINKS);

		if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {

			hw->fc.fc_was_autonegged = false;

			hw->fc.current_mode = hw->fc.requested_mode;

			goto out;

		}



		if (hw->mac.type == ixgbe_mac_82599EB) {

			links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);

		if (((links & IXGBE_LINKS_KX_AN_COMP) == 0) ||

		    ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0)) {

			if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {

				hw->fc.fc_was_autonegged = false;

				hw->fc.current_mode = hw->fc.requested_mode;

				goto out;

			}

		}

	}



	/*

	 * On multispeed fiber at 1g, bail out if