diff mbox

[net-next,15/21] ixgbe: Configure advertised speeds correctly for KR/KX backplane

Message ID 20161230093341.14674-16-jeffrey.t.kirsher@intel.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Kirsher, Jeffrey T Dec. 30, 2016, 9:33 a.m. UTC
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(-)

Comments

Sergei Shtylyov Dec. 30, 2016, 11:01 a.m. UTC | #1
Hello.

On 12/30/2016 12:33 PM, Jeff Kirsher wrote:

> 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 */

    Link, maybe?

> +	if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_2_5GB_FULL)
>  		return 0;
>
>  	return ixgbe_setup_kr_speed_x550em(hw, hw->phy.autoneg_advertised);

MBR, Sergei
Rami Rosen Dec. 30, 2016, 1:01 p.m. UTC | #2
Hi,

Hi,

On this occasion, also the next can be fixed:

> 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.


Should be "from" instead "from", I would assume.

Regards,
Rami Rosen
Intel Corporation
diff mbox

Patch

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);