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

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

bnx2x: 57840 non-external loopback test fail on 1G 



when 1G-optic module was plugged in, internal loopback test failed because the
driver used to check the optic module (with no need), and for 1G optic module,
the link speed was forced down to 1G, while the XMAC (10G MAC) was enabled.
This patch avoid accessing optic module in case internal loopback was selected,
and update the link speed in case 1G optic module was detected during init
stage.

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 4e4b14c9

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

+13 −4
Original line number Diff line number Diff line
@@ -4523,10 +4523,14 @@ static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy, 
			 * enabled transmitter to avoid current leakage in case

			 * no module is connected

			 */

			if ((params->loopback_mode == LOOPBACK_NONE) ||

			    (params->loopback_mode == LOOPBACK_EXT)) {

				if (bnx2x_is_sfp_module_plugged(phy, params))

					bnx2x_sfp_module_detection(phy, params);

				else

				bnx2x_sfp_e3_set_transmitter(params, phy, 1);

					bnx2x_sfp_e3_set_transmitter(params,

								     phy, 1);

			}



			bnx2x_warpcore_config_sfi(phy, params);

			break;
@@ -6528,6 +6532,11 @@ static int bnx2x_link_initialize(struct link_params *params, 
			params->phy[INT_PHY].config_init(phy, params, vars);

	}



	/* Re-read this value in case it was changed inside config_init due to

	 * limitations of optic module

	 */

	vars->line_speed = params->phy[INT_PHY].req_line_speed;



	/* Init external phy*/

	if (non_ext_phy) {

		if (params->phy[INT_PHY].supported &