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

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

bnx2x: Allow RX/TX pause control in autoneg 



Currently, when link is configured to auto-negotiate the flow control,
disabling RX/TX pause via ethtool doesn't work.

This fixes the behaviour, advertising asymmetric pause in case either one
is exclusively enabled.

Signed-off-by: default avatarYaniv Rosner <yanivr@broadcom.com>
Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c2d06d5

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

+4 −1
Original line number Diff line number Diff line
@@ -1889,12 +1889,15 @@ static int bnx2x_set_pauseparam(struct net_device *dev, 
			bp->link_params.req_flow_ctrl[cfg_idx] =

				BNX2X_FLOW_CTRL_AUTO;

		}

		bp->link_params.req_fc_auto_adv = BNX2X_FLOW_CTRL_NONE;

		bp->link_params.req_fc_auto_adv = 0;

		if (epause->rx_pause)

			bp->link_params.req_fc_auto_adv |= BNX2X_FLOW_CTRL_RX;



		if (epause->tx_pause)

			bp->link_params.req_fc_auto_adv |= BNX2X_FLOW_CTRL_TX;



		if (!bp->link_params.req_fc_auto_adv)

			bp->link_params.req_fc_auto_adv |= BNX2X_FLOW_CTRL_NONE;

	}



	DP(BNX2X_MSG_ETHTOOL,

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

+10 −4
Original line number Diff line number Diff line
@@ -3426,13 +3426,19 @@ static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy, 


	switch (phy->req_flow_ctrl) {

	case BNX2X_FLOW_CTRL_AUTO:

		if (params->req_fc_auto_adv == BNX2X_FLOW_CTRL_BOTH)

		switch (params->req_fc_auto_adv) {

		case BNX2X_FLOW_CTRL_BOTH:

			*ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;

		else

			break;

		case BNX2X_FLOW_CTRL_RX:

		case BNX2X_FLOW_CTRL_TX:

			*ieee_fc |=

				MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;

			break;



		default:

			break;

		}

		break;

	case BNX2X_FLOW_CTRL_TX:

		*ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;

		break;