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>
This commit is contained in:
parent
9bbe3a570b
commit
000c486dda
1 changed files with 11 additions and 4 deletions
|
@ -1755,17 +1755,24 @@ s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw)
|
||||||
/*
|
/*
|
||||||
* On backplane, bail out if
|
* On backplane, bail out if
|
||||||
* - backplane autoneg was not completed, or 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) {
|
if (hw->phy.media_type == ixgbe_media_type_backplane) {
|
||||||
links = IXGBE_READ_REG(hw, IXGBE_LINKS);
|
links = IXGBE_READ_REG(hw, IXGBE_LINKS);
|
||||||
links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);
|
if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {
|
||||||
if (((links & IXGBE_LINKS_KX_AN_COMP) == 0) ||
|
|
||||||
((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0)) {
|
|
||||||
hw->fc.fc_was_autonegged = false;
|
hw->fc.fc_was_autonegged = false;
|
||||||
hw->fc.current_mode = hw->fc.requested_mode;
|
hw->fc.current_mode = hw->fc.requested_mode;
|
||||||
goto out;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Reference in a new issue