UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

bcm63xx_enet: add BQL support 

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>
This commit is contained in:
Sieng Piaw Liew 2021-01-06 22:42:03 +08:00 committed by Jakub Kicinski
parent 9cbfea02c1
commit 4c59b0f554
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/broadcom/bcm63xx_enet.c
View File

@ -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) static int bcm_enet_tx_reclaim(struct net_device *dev, int force)
{ {
struct bcm_enet_priv *priv; struct bcm_enet_priv *priv;
unsigned int bytes;
int released; int released;
priv = netdev_priv(dev); priv = netdev_priv(dev);
bytes = 0;
released = 0; released = 0;
while (priv->tx_desc_count < priv->tx_ring_size) { while (priv->tx_desc_count < priv->tx_ring_size) {
@ -456,10 +458,13 @@ static int bcm_enet_tx_reclaim(struct net_device *dev, int force)
if (desc->len_stat & DMADESC_UNDER_MASK) if (desc->len_stat & DMADESC_UNDER_MASK)
dev->stats.tx_errors++; dev->stats.tx_errors++;
bytes += skb->len;
dev_kfree_skb(skb); dev_kfree_skb(skb);
released++; released++;
} }
netdev_completed_queue(dev, released, bytes);
if (netif_queue_stopped(dev) && released) if (netif_queue_stopped(dev) && released)
netif_wake_queue(dev); netif_wake_queue(dev);
@ -626,6 +631,8 @@ bcm_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
desc->len_stat = len_stat; desc->len_stat = len_stat;
wmb(); wmb();
netdev_sent_queue(dev, skb->len);
/* kick tx dma */ /* kick tx dma */
enet_dmac_writel(priv, priv->dma_chan_en_mask, enet_dmac_writel(priv, priv->dma_chan_en_mask,
ENETDMAC_CHANCFG, priv->tx_chan); ENETDMAC_CHANCFG, priv->tx_chan);
@ -1169,6 +1176,7 @@ static int bcm_enet_stop(struct net_device *dev)
kdev = &priv->pdev->dev; kdev = &priv->pdev->dev;
netif_stop_queue(dev); netif_stop_queue(dev);
netdev_reset_queue(dev);
napi_disable(&priv->napi); napi_disable(&priv->napi);
if (priv->has_phy) if (priv->has_phy)
phy_stop(dev->phydev); phy_stop(dev->phydev);
@ -2338,6 +2346,7 @@ static int bcm_enetsw_stop(struct net_device *dev)
del_timer_sync(&priv->swphy_poll); del_timer_sync(&priv->swphy_poll);
netif_stop_queue(dev); netif_stop_queue(dev);
netdev_reset_queue(dev);
napi_disable(&priv->napi); napi_disable(&priv->napi);
del_timer_sync(&priv->rx_timeout); del_timer_sync(&priv->rx_timeout);