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

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

bnx2x: Remove 100Mb force speed for BCM84833 



Remove unsupported speed of 100Mb force for BCM84833 due to hardware
limitation.

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 127302bb

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

+6 −1
Original line number Diff line number Diff line
@@ -365,13 +365,18 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	DP(NETIF_MSG_LINK, "cfg_idx = %x\n", cfg_idx);



	if (cmd->autoneg == AUTONEG_ENABLE) {

		u32 an_supported_speed = bp->port.supported[cfg_idx];

		if (bp->link_params.phy[EXT_PHY1].type ==

		    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)

			an_supported_speed |= (SUPPORTED_100baseT_Half |

					       SUPPORTED_100baseT_Full);

		if (!(bp->port.supported[cfg_idx] & SUPPORTED_Autoneg)) {

			DP(NETIF_MSG_LINK, "Autoneg not supported\n");

			return -EINVAL;

		}



		/* advertise the requested speed and duplex if supported */

		if (cmd->advertising & ~(bp->port.supported[cfg_idx])) {

		if (cmd->advertising & ~an_supported_speed) {

			DP(NETIF_MSG_LINK, "Advertisement parameters "

					   "are not supported\n");

			return -EINVAL;

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

+15 −5
Original line number Diff line number Diff line
@@ -9454,13 +9454,10 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy, 
			 an_1000_val);



	/* set 100 speed advertisement */

	if (((phy->req_line_speed == SPEED_AUTO_NEG) &&

	if ((phy->req_line_speed == SPEED_AUTO_NEG) &&

	     (phy->speed_cap_mask &

	      (PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_FULL |

	       PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_HALF)) &&

	     (phy->supported &

	      (SUPPORTED_100baseT_Half |

	       SUPPORTED_100baseT_Full)))) {

	       PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_HALF))) {

		an_10_100_val |= (1<<7);

		/* Enable autoneg and restart autoneg for legacy speeds */

		autoneg_val |= (1<<9 | 1<<12);
@@ -11528,6 +11525,19 @@ static int bnx2x_populate_ext_phy(struct bnx2x *bp, 
	}

	phy->mdio_ctrl = bnx2x_get_emac_base(bp, mdc_mdio_access, port);



	if ((phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) &&

	    (phy->ver_addr)) {

		/*

		 * Remove 100Mb link supported for BCM84833 when phy fw

		 * version lower than or equal to 1.39

		 */

		u32 raw_ver = REG_RD(bp, phy->ver_addr);

		if (((raw_ver & 0x7F) <= 39) &&

		    (((raw_ver & 0xF80) >> 7) <= 1))

			phy->supported &= ~(SUPPORTED_100baseT_Half |

					    SUPPORTED_100baseT_Full);

	}



	/*

	 * In case mdc/mdio_access of the external phy is different than the

	 * mdc/mdio access of the XGXS, a HW lock must be taken in each access