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

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

bnx2x: Fix link down in 57712 following LFA 



In case of link flap avoidance between PXE boot and bnx2x, set the appropriate
PHY DEVAD even if LFA kicks in.

Signed-off-by: default avatarYaniv Rosner <yanivr@broadcom.com>
Signed-off-by: default avatarBarak Witkowski <barak@broadcom.com>
Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b457bcb9

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

+18 −5
Original line number Diff line number Diff line
@@ -3295,6 +3295,21 @@ static void bnx2x_serdes_deassert(struct bnx2x *bp, u8 port) 
	       DEFAULT_PHY_DEV_ADDR);

}



static void bnx2x_xgxs_specific_func(struct bnx2x_phy *phy,

				     struct link_params *params,

				     u32 action)

{

	struct bnx2x *bp = params->bp;

	switch (action) {

	case PHY_INIT:

		/* Set correct devad */

		REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_ST + params->port*0x18, 0);

		REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + params->port*0x18,

		       phy->def_md_devad);

		break;

	}

}



static void bnx2x_xgxs_deassert(struct link_params *params)

{

	struct bnx2x *bp = params->bp;
@@ -3309,10 +3324,8 @@ static void bnx2x_xgxs_deassert(struct link_params *params) 
	REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_CLEAR, val);

	udelay(500);

	REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_SET, val);



	REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_ST + port*0x18, 0);

	REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18,

	       params->phy[INT_PHY].def_md_devad);

	bnx2x_xgxs_specific_func(&params->phy[INT_PHY], params,

				 PHY_INIT);

}



static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy,
@@ -10999,7 +11012,7 @@ static struct bnx2x_phy phy_xgxs = { 
	.format_fw_ver	= (format_fw_ver_t)NULL,

	.hw_reset	= (hw_reset_t)NULL,

	.set_link_led	= (set_link_led_t)NULL,

	.phy_specific_func = (phy_specific_func_t)NULL

	.phy_specific_func = (phy_specific_func_t)bnx2x_xgxs_specific_func

};

static struct bnx2x_phy phy_warpcore = {

	.type		= PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT,