netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Don Skidmore <donald.c.skidmore@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	jogreene@redhat.com, guru.anbalagane@oracle.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 15/21] ixgbe: Configure advertised speeds correctly for KR/KX backplane
Date: Fri, 30 Dec 2016 01:33:35 -0800	[thread overview]
Message-ID: <20161230093341.14674-16-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20161230093341.14674-1-jeffrey.t.kirsher@intel.com>

From: Don Skidmore <donald.c.skidmore@intel.com>

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 form 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>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index 92f2b5e..675c198 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -2187,12 +2187,11 @@ static s32 ixgbe_setup_kx4_x550em(struct ixgbe_hw *hw)
 /**
  * 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 linke 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);
-- 
2.9.3

  parent reply	other threads:[~2016-12-30  9:33 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-30  9:33 [net-next 00/21][pull request] 10GbE Intel Wired LAN Driver Updates 2016-12-29 Jeff Kirsher
2016-12-30  9:33 ` [net-next 01/21] ixgbe: do not disable FEC from the driver Jeff Kirsher
2016-12-30  9:33 ` [net-next 02/21] ixgbe: Report driver version to firmware for x550 devices Jeff Kirsher
2016-12-30  9:33 ` [net-next 03/21] ixgbe: Fix check for ixgbe_phy_x550em_ext_t reset Jeff Kirsher
2016-12-30  9:33 ` [net-next 04/21] ixgbe: add mask for 64 RSS queues Jeff Kirsher
2016-12-30  9:33 ` [net-next 05/21] ixgbe: Add bounds check for x540 LED functions Jeff Kirsher
2016-12-30  9:33 ` [net-next 06/21] ixgbe: Reduce I2C retry count on X550 devices Jeff Kirsher
2016-12-30  9:33 ` [net-next 07/21] ixgbe: Fix reporting of 100Mb capability Jeff Kirsher
2016-12-30  9:33 ` [net-next 08/21] ixgbe: handle close/suspend race with netif_device_detach/present Jeff Kirsher
2016-12-30  9:33 ` [net-next 09/21] ixgbevf: handle race between close and suspend on shutdown Jeff Kirsher
2016-12-30  9:33 ` [net-next 10/21] ixgbe: test for trust in macvlan adjustments for VF Jeff Kirsher
2016-12-30  9:33 ` [net-next 11/21] ixgbe: fix AER error handling Jeff Kirsher
2016-12-30  9:33 ` [net-next 12/21] ixgbevf: " Jeff Kirsher
2016-12-30 10:38   ` Sergei Shtylyov
2016-12-30  9:33 ` [net-next 13/21] ixgbe: Fix incorrect bitwise operations of PTP Rx timestamp flags Jeff Kirsher
2016-12-30  9:33 ` [net-next 14/21] ixgbevf: restore hw_addr on resume or error Jeff Kirsher
2016-12-30  9:33 ` Jeff Kirsher [this message]
2016-12-30 11:01   ` [net-next 15/21] ixgbe: Configure advertised speeds correctly for KR/KX backplane Sergei Shtylyov
2016-12-30 13:01     ` Rosen, Rami
2016-12-30  9:33 ` [net-next 16/21] ixgbe: Fix issues with EEPROM access Jeff Kirsher
2016-12-30  9:33 ` [net-next 17/21] ixgbe: Remove unused firmware version functions and method Jeff Kirsher
2016-12-30  9:33 ` [net-next 18/21] ixgbe: Implement firmware interface to access some PHYs Jeff Kirsher
2016-12-30  9:33 ` [net-next 19/21] ixgbe: Implement support for firmware-controlled PHYs Jeff Kirsher
2016-12-30  9:33 ` [net-next 20/21] ixgbevf: Add support for VF promiscuous mode Jeff Kirsher
2016-12-30  9:33 ` [net-next 21/21] ixgbe: Add PF " Jeff Kirsher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161230093341.14674-16-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=donald.c.skidmore@intel.com \
    --cc=guru.anbalagane@oracle.com \
    --cc=jogreene@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).