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

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

bnx2x: Fix potential link loss in multi-function mode 



All functions on a port should be set to take the MDC/MDIO lock to avoid contention on the bus

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 c8e64df4

drivers/net/bnx2x/bnx2x_main.c

+11 −7
Original line number Original line Diff line number Diff line
@@ -5296,10 +5296,6 @@ static int bnx2x_init_hw_common(struct bnx2x *bp, u32 load_code) 
		}

		}

	}

	}





	bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,

						       bp->common.shmem_base,

						       bp->common.shmem2_base);



	bnx2x_setup_fan_failure_detection(bp);

	bnx2x_setup_fan_failure_detection(bp);





	/* clear PXP2 attentions */

	/* clear PXP2 attentions */
@@ -5503,9 +5499,6 @@ static int bnx2x_init_hw_port(struct bnx2x *bp) 




	bnx2x_init_block(bp, MCP_BLOCK, init_stage);

	bnx2x_init_block(bp, MCP_BLOCK, init_stage);

	bnx2x_init_block(bp, DMAE_BLOCK, init_stage);

	bnx2x_init_block(bp, DMAE_BLOCK, init_stage);

	bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,

						       bp->common.shmem_base,

						       bp->common.shmem2_base);

	if (bnx2x_fan_failure_det_req(bp, bp->common.shmem_base,

	if (bnx2x_fan_failure_det_req(bp, bp->common.shmem_base,

				      bp->common.shmem2_base, port)) {

				      bp->common.shmem2_base, port)) {

		u32 reg_addr = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 :

		u32 reg_addr = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 :
@@ -8379,6 +8372,17 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp) 
		 (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN))

		 (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN))

		bp->mdio.prtad =

		bp->mdio.prtad =

			XGXS_EXT_PHY_ADDR(ext_phy_config);

			XGXS_EXT_PHY_ADDR(ext_phy_config);



	/*

	 * Check if hw lock is required to access MDC/MDIO bus to the PHY(s)

	 * In MF mode, it is set to cover self test cases

	 */

	if (IS_MF(bp))

		bp->port.need_hw_lock = 1;

	else

		bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,

							bp->common.shmem_base,

							bp->common.shmem2_base);

}

}





static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)

static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)