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

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

bnx2x: Do not enable CL37 BAM unless it is explicitly enabled 



Enabling CL37 BAM on BCM8073 by default may lead to link issues since
not all switches support it. So enable CL37 BAM only if explicitly
selected.

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 650154bf

drivers/net/bnx2x/bnx2x_hsi.h

+8 −1
Original line number Diff line number Diff line
@@ -244,7 +244,14 @@ struct port_hw_cfg { /* port 0: 0x12c port 1: 0x2bc */ 


	u16 xgxs_config_tx[4];				    /* 0x1A0 */



	u32 Reserved1[57];				    /* 0x1A8 */

	u32 Reserved1[56];				    /* 0x1A8 */

	u32 default_cfg;				    /* 0x288 */

	/*  Enable BAM on KR */

#define PORT_HW_CFG_ENABLE_BAM_ON_KR_MASK		      0x00100000

#define PORT_HW_CFG_ENABLE_BAM_ON_KR_SHIFT		      20

#define PORT_HW_CFG_ENABLE_BAM_ON_KR_DISABLED		      0x00000000

#define PORT_HW_CFG_ENABLE_BAM_ON_KR_ENABLED		      0x00100000



	u32 speed_capability_mask2;			    /* 0x28C */

#define PORT_HW_CFG_SPEED_CAPABILITY2_D3_MASK		      0x0000FFFF

#define PORT_HW_CFG_SPEED_CAPABILITY2_D3_SHIFT		      0

drivers/net/bnx2x/bnx2x_link.c

+12 −6
Original line number Diff line number Diff line
@@ -3525,13 +3525,19 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy, 
	DP(NETIF_MSG_LINK, "Before rom RX_ALARM(port1): 0x%x\n", tmp1);



	/* Enable CL37 BAM */

	if (REG_RD(bp, params->shmem_base +

			 offsetof(struct shmem_region, dev_info.

				  port_hw_config[params->port].default_cfg)) &

	    PORT_HW_CFG_ENABLE_BAM_ON_KR_ENABLED) {



		bnx2x_cl45_read(bp, phy,

				MDIO_AN_DEVAD,

				MDIO_AN_REG_8073_BAM, &val);

		bnx2x_cl45_write(bp, phy,

				 MDIO_AN_DEVAD,

				 MDIO_AN_REG_8073_BAM, val | 1);



		DP(NETIF_MSG_LINK, "Enable CL37 BAM on KR\n");

	}

	if (params->loopback_mode == LOOPBACK_EXT) {

		bnx2x_807x_force_10G(bp, phy);

		DP(NETIF_MSG_LINK, "Forced speed 10G on 807X\n");