| From foo@baz Sun Nov 19 11:32:28 CET 2017 |
| From: Don Skidmore <donald.c.skidmore@intel.com> |
| Date: Tue, 13 Dec 2016 20:34:51 -0500 |
| Subject: ixgbe: Configure advertised speeds correctly for KR/KX backplane |
| |
| From: Don Skidmore <donald.c.skidmore@intel.com> |
| |
| |
| [ Upstream commit 54f6d4c42451dbd2cc7e0f0bd8fc3eddcab511fe ] |
| |
| This patch ensures that the advertised link speeds are configured |
| for X553 KR/KX backplane. Without this patch the link remains at |
| 1G when resuming from low power after being downshifted by LPLU. |
| |
| Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> |
| Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c |
| +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c |
| @@ -1995,12 +1995,11 @@ static s32 ixgbe_setup_kx4_x550em(struct |
| /** |
| * ixgbe_setup_kr_x550em - Configure the KR PHY |
| * @hw: pointer to hardware structure |
| - * |
| - * Configures the integrated KR PHY for X550EM_x. |
| **/ |
| static s32 ixgbe_setup_kr_x550em(struct ixgbe_hw *hw) |
| { |
| - if (hw->mac.type != ixgbe_mac_X550EM_x) |
| + /* leave link alone for 2.5G */ |
| + if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_2_5GB_FULL) |
| return 0; |
| |
| return ixgbe_setup_kr_speed_x550em(hw, hw->phy.autoneg_advertised); |
