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: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index f42a954ef6600d3da7fe8b3dbee4b0714424c24c..79533e2720f9685c5ac9e39ac56b5fedd0f89227 100644 (file)
--- 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)
        /*
         * 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);
-               links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);
-               if (((links & IXGBE_LINKS_KX_AN_COMP) == 0) ||
-                   ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0)) {
+               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 ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {
+                               hw->fc.fc_was_autonegged = false;
+                               hw->fc.current_mode = hw->fc.requested_mode;
+                               goto out;
+                       }
+               }
        }
 
        /*