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

Commit e178c8c2 authored by Petri Gynther's avatar Petri Gynther Committed by David S. Miller
Browse files

net: bcmgenet: add BQL support 



Add Byte Queue Limits (BQL) support to bcmgenet driver.

Signed-off-by: default avatarPetri Gynther <pgynther@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dac916f8

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+14 −1
Original line number Diff line number Diff line
@@ -1221,8 +1221,10 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev, 
	dev->stats.tx_packets += pkts_compl;

	dev->stats.tx_bytes += bytes_compl;



	if (ring->free_bds > (MAX_SKB_FRAGS + 1)) {

	txq = netdev_get_tx_queue(dev, ring->queue);

	netdev_tx_completed_queue(txq, pkts_compl, bytes_compl);



	if (ring->free_bds > (MAX_SKB_FRAGS + 1)) {

		if (netif_tx_queue_stopped(txq))

			netif_tx_wake_queue(txq);

	}
@@ -1516,6 +1518,8 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev) 
	ring->prod_index += nr_frags + 1;

	ring->prod_index &= DMA_P_INDEX_MASK;



	netdev_tx_sent_queue(txq, GENET_CB(skb)->bytes_sent);



	if (ring->free_bds <= (MAX_SKB_FRAGS + 1))

		netif_tx_stop_queue(txq);
@@ -2364,6 +2368,7 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv) 
static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)

{

	int i;

	struct netdev_queue *txq;



	bcmgenet_fini_rx_napi(priv);

	bcmgenet_fini_tx_napi(priv);
@@ -2378,6 +2383,14 @@ static void bcmgenet_fini_dma(struct bcmgenet_priv *priv) 
		}

	}



	for (i = 0; i < priv->hw_params->tx_queues; i++) {

		txq = netdev_get_tx_queue(priv->dev, priv->tx_rings[i].queue);

		netdev_tx_reset_queue(txq);

	}



	txq = netdev_get_tx_queue(priv->dev, priv->tx_rings[DESC_INDEX].queue);

	netdev_tx_reset_queue(txq);



	bcmgenet_free_rx_buffers(priv);

	kfree(priv->rx_cbs);

	kfree(priv->tx_cbs);