Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be94bea7 authored by Yaniv Rosner's avatar Yaniv Rosner Committed by David S. Miller
Browse files

bnx2x: Fix KR2 link 



Fix KR2 link down problem after reboot when link speed is reconfigured via ethtool.
Since 1G/10G support link speed were missing by default, 1G/10G link speed were
not advertised.

Signed-off-by: default avatarYaniv Rosner <yanivr@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ce76845

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+6 −0
Original line number Diff line number Diff line
@@ -281,6 +281,8 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
			cmd->lp_advertising |= ADVERTISED_2500baseX_Full;

		if (status & LINK_STATUS_LINK_PARTNER_10GXFD_CAPABLE)

			cmd->lp_advertising |= ADVERTISED_10000baseT_Full;

		if (status & LINK_STATUS_LINK_PARTNER_20GXFD_CAPABLE)

			cmd->lp_advertising |= ADVERTISED_20000baseKR2_Full;

	}



	cmd->maxtxpkt = 0;
@@ -463,6 +465,10 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
						ADVERTISED_10000baseKR_Full))

				bp->link_params.speed_cap_mask[cfg_idx] |=

					PORT_HW_CFG_SPEED_CAPABILITY_D0_10G;



			if (cmd->advertising & ADVERTISED_20000baseKR2_Full)

				bp->link_params.speed_cap_mask[cfg_idx] |=

					PORT_HW_CFG_SPEED_CAPABILITY_D0_20G;

		}

	} else { /* forced speed */

		/* advertise the requested speed and duplex if supported */

drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c

+2 −0
Original line number Diff line number Diff line
@@ -11851,6 +11851,8 @@ static int bnx2x_populate_int_phy(struct bnx2x *bp, u32 shmem_base, u8 port, 
			phy->media_type = ETH_PHY_KR;

			phy->flags |= FLAGS_WC_DUAL_MODE;

			phy->supported &= (SUPPORTED_20000baseKR2_Full |

					   SUPPORTED_10000baseT_Full |

					   SUPPORTED_1000baseT_Full |

					   SUPPORTED_Autoneg |

					   SUPPORTED_FIBRE |

					   SUPPORTED_Pause |