Commit d99c6fa4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-fixes' 



Michael Chan says:

====================
bnxt_en: 3 bug fixes.

2 Fixes related to PHY/link settings.  The last one fixes the sizing of
the completion ring.

Please also queue for -stable.  Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1df0d896 27640ce6

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+15 −7
Original line number Diff line number Diff line
@@ -3418,7 +3418,7 @@ void bnxt_set_tpa_flags(struct bnxt *bp) 
 */

void bnxt_set_ring_params(struct bnxt *bp)

{

	u32 ring_size, rx_size, rx_space;

	u32 ring_size, rx_size, rx_space, max_rx_cmpl;

	u32 agg_factor = 0, agg_ring_size = 0;



	/* 8 for CRC and VLAN */
@@ -3474,7 +3474,15 @@ void bnxt_set_ring_params(struct bnxt *bp) 
	bp->tx_nr_pages = bnxt_calc_nr_ring_pages(ring_size, TX_DESC_CNT);

	bp->tx_ring_mask = (bp->tx_nr_pages * TX_DESC_CNT) - 1;



	ring_size = bp->rx_ring_size * (2 + agg_factor) + bp->tx_ring_size;

	max_rx_cmpl = bp->rx_ring_size;

	/* MAX TPA needs to be added because TPA_START completions are

	 * immediately recycled, so the TPA completions are not bound by

	 * the RX ring size.

	 */

	if (bp->flags & BNXT_FLAG_TPA)

		max_rx_cmpl += bp->max_tpa;

	/* RX and TPA completions are 32-byte, all others are 16-byte */

	ring_size = max_rx_cmpl * 2 + agg_ring_size + bp->tx_ring_size;

	bp->cp_ring_size = ring_size;



	bp->cp_nr_pages = bnxt_calc_nr_ring_pages(ring_size, CP_DESC_CNT);
@@ -10385,15 +10393,15 @@ static void bnxt_sp_task(struct work_struct *work) 
				       &bp->sp_event))

			bnxt_hwrm_phy_qcaps(bp);



		if (test_and_clear_bit(BNXT_LINK_CFG_CHANGE_SP_EVENT,

				       &bp->sp_event))

			bnxt_init_ethtool_link_settings(bp);



		rc = bnxt_update_link(bp, true);

		mutex_unlock(&bp->link_lock);

		if (rc)

			netdev_err(bp->dev, "SP task can't update link (rc: %x)\n",

				   rc);



		if (test_and_clear_bit(BNXT_LINK_CFG_CHANGE_SP_EVENT,

				       &bp->sp_event))

			bnxt_init_ethtool_link_settings(bp);

		mutex_unlock(&bp->link_lock);

	}

	if (test_and_clear_bit(BNXT_UPDATE_PHY_SP_EVENT, &bp->sp_event)) {

		int rc;

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+4 −1
Original line number Diff line number Diff line
@@ -1765,8 +1765,11 @@ static int bnxt_set_pauseparam(struct net_device *dev, 
	if (epause->tx_pause)

		link_info->req_flow_ctrl |= BNXT_LINK_PAUSE_TX;



	if (netif_running(dev))

	if (netif_running(dev)) {

		mutex_lock(&bp->link_lock);

		rc = bnxt_hwrm_set_pause(bp);

		mutex_unlock(&bp->link_lock);

	}

	return rc;

}