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

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

bnx2x: Fix link issue for BCM8727 boards. 



This patch fixes a link problem on BCM57712 + BCM8727 designs in which the TX
laser is controller by GPIO, after 1.60.xx drivers were previously loaded.
On these designs the TX_LASER is enabled by logic AND between the PHY
(through MDIO), and the GPIO. When an old driver is used, it disables the
MDIO part, hence the GPIO control had no affect de facto.

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 9379c9be

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

+14 −7
Original line number Diff line number Diff line
@@ -8089,6 +8089,8 @@ static int bnx2x_verify_sfp_module(struct bnx2x_phy *phy, 
	netdev_err(bp->dev,  "Warning: Unqualified SFP+ module detected,"

			      " Port %d from %s part number %s\n",

			 params->port, vendor_name, vendor_pn);

	if ((val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) !=

	    PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_WARNING_MSG)

		phy->flags |= FLAGS_SFP_NOT_APPROVED;

	return -EINVAL;

}
@@ -9149,6 +9151,12 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy, 
		tmp2 &= 0xFFEF;

		bnx2x_cl45_write(bp, phy,

			MDIO_PMA_DEVAD, MDIO_PMA_REG_8727_OPT_CFG_REG, tmp2);

		bnx2x_cl45_read(bp, phy,

				MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER,

				&tmp2);

		bnx2x_cl45_write(bp, phy,

				 MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER,

				 (tmp2 & 0x7fff));

	}



	return 0;
@@ -9329,12 +9337,11 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy, 
				 MDIO_PMA_DEVAD, MDIO_PMA_LASI_RXCTRL,

				 ((1<<5) | (1<<2)));

	}

	DP(NETIF_MSG_LINK, "Enabling 8727 TX laser if SFP is approved\n");

	bnx2x_8727_specific_func(phy, params, ENABLE_TX);

	/* If transmitter is disabled, ignore false link up indication */

	bnx2x_cl45_read(bp, phy,

			MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER, &val1);

	if (val1 & (1<<15)) {



	if (!(phy->flags & FLAGS_SFP_NOT_APPROVED)) {

		DP(NETIF_MSG_LINK, "Enabling 8727 TX laser\n");

		bnx2x_sfp_set_transmitter(params, phy, 1);

	} else {

		DP(NETIF_MSG_LINK, "Tx is disabled\n");

		return 0;

	}