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

Commit 817a8aa8 authored by Mintz Yuval's avatar Mintz Yuval Committed by David S. Miller
Browse files

bnx2x: force 10G on 84833 phy should be autoneg with only 10G advertised 



From: Yaniv Rosner <yaniv.rosner@broadcom.com>

Signed-off-by: default avatarYaniv Rosner <yaniv.rosner@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b85ae52

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

+1 −8
Original line number Diff line number Diff line
@@ -9492,13 +9492,8 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy, 
{

	struct bnx2x *bp = params->bp;

	u16 autoneg_val, an_1000_val, an_10_100_val, an_10g_val;

	u16 tmp_req_line_speed;



	tmp_req_line_speed = phy->req_line_speed;

	if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {

		if (phy->req_line_speed == SPEED_10000)

			phy->req_line_speed = SPEED_AUTO_NEG;

	} else {

	if (phy->type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {

		/* Save spirom version */

		bnx2x_save_848xx_spirom_version(phy, bp, params->port);

	}
@@ -9642,8 +9637,6 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy, 
				 MDIO_AN_REG_8481_10GBASE_T_AN_CTRL,

				 1);



	phy->req_line_speed = tmp_req_line_speed;



	return 0;

}