Skip to content

Commit

Permalink
bcm63xx_enet: add BQL support
Browse files Browse the repository at this point in the history
Add Byte Queue Limits support to reduce/remove bufferbloat in
bcm63xx_enet.

Signed-off-by: Sieng Piaw Liew <liew.s.piaw@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Sieng Piaw Liew authored and Jakub Kicinski committed Jan 7, 2021
1 parent 9cbfea0 commit 4c59b0f
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions drivers/net/ethernet/broadcom/bcm63xx_enet.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,9 +417,11 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)
static int bcm_enet_tx_reclaim(struct net_device *dev, int force)
{
struct bcm_enet_priv *priv;
unsigned int bytes;
int released;

priv = netdev_priv(dev);
bytes = 0;
released = 0;

while (priv->tx_desc_count < priv->tx_ring_size) {
Expand Down Expand Up @@ -456,10 +458,13 @@ static int bcm_enet_tx_reclaim(struct net_device *dev, int force)
if (desc->len_stat & DMADESC_UNDER_MASK)
dev->stats.tx_errors++;

bytes += skb->len;
dev_kfree_skb(skb);
released++;
}

netdev_completed_queue(dev, released, bytes);

if (netif_queue_stopped(dev) && released)
netif_wake_queue(dev);

Expand Down Expand Up @@ -626,6 +631,8 @@ bcm_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
desc->len_stat = len_stat;
wmb();

netdev_sent_queue(dev, skb->len);

/* kick tx dma */
enet_dmac_writel(priv, priv->dma_chan_en_mask,
ENETDMAC_CHANCFG, priv->tx_chan);
Expand Down Expand Up @@ -1169,6 +1176,7 @@ static int bcm_enet_stop(struct net_device *dev)
kdev = &priv->pdev->dev;

netif_stop_queue(dev);
netdev_reset_queue(dev);
napi_disable(&priv->napi);
if (priv->has_phy)
phy_stop(dev->phydev);
Expand Down Expand Up @@ -2338,6 +2346,7 @@ static int bcm_enetsw_stop(struct net_device *dev)

del_timer_sync(&priv->swphy_poll);
netif_stop_queue(dev);
netdev_reset_queue(dev);
napi_disable(&priv->napi);
del_timer_sync(&priv->rx_timeout);

Expand Down

0 comments on commit 4c59b0f

Please sign in to comment.