target/linux/bcm63xx/patches-5.10/021-v5.12-bcm63xx_enet-add-BQL-support.patch

   1 From 4c59b0f5543db80abbbe9efdd9b25e7899501db5 Mon Sep 17 00:00:00 2001
   2 From: Sieng Piaw Liew <liew.s.piaw@gmail.com>
   3 Date: Wed, 6 Jan 2021 22:42:03 +0800
   4 Subject: [PATCH 2/7] bcm63xx_enet: add BQL support
   5
   6 Add Byte Queue Limits support to reduce/remove bufferbloat in
   7 bcm63xx_enet.
   8
   9 Signed-off-by: Sieng Piaw Liew <liew.s.piaw@gmail.com>
  10 Acked-by: Florian Fainelli <f.fainelli@gmail.com>
  11 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  12 ---
  13  drivers/net/ethernet/broadcom/bcm63xx_enet.c | 9 +++++++++
  14  1 file changed, 9 insertions(+)
  15
  16 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
  17 +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
  18 @@ -417,9 +417,11 @@ static int bcm_enet_receive_queue(struct
  19  static int bcm_enet_tx_reclaim(struct net_device *dev, int force)
  20  {
  21         struct bcm_enet_priv *priv;
  22 +       unsigned int bytes;
  23         int released;
  24
  25         priv = netdev_priv(dev);
  26 +       bytes = 0;
  27         released = 0;
  28
  29         while (priv->tx_desc_count < priv->tx_ring_size) {
  30 @@ -456,10 +458,13 @@ static int bcm_enet_tx_reclaim(struct ne
  31                 if (desc->len_stat & DMADESC_UNDER_MASK)
  32                         dev->stats.tx_errors++;
  33
  34 +               bytes += skb->len;
  35                 dev_kfree_skb(skb);
  36                 released++;
  37         }
  38
  39 +       netdev_completed_queue(dev, released, bytes);
  40 +
  41         if (netif_queue_stopped(dev) && released)
  42                 netif_wake_queue(dev);
  43
  44 @@ -626,6 +631,8 @@ bcm_enet_start_xmit(struct sk_buff *skb,
  45         desc->len_stat = len_stat;
  46         wmb();
  47
  48 +       netdev_sent_queue(dev, skb->len);
  49 +
  50         /* kick tx dma */
  51         enet_dmac_writel(priv, priv->dma_chan_en_mask,
  52                                  ENETDMAC_CHANCFG, priv->tx_chan);
  53 @@ -1169,6 +1176,7 @@ static int bcm_enet_stop(struct net_devi
  54         kdev = &priv->pdev->dev;
  55
  56         netif_stop_queue(dev);
  57 +       netdev_reset_queue(dev);
  58         napi_disable(&priv->napi);
  59         if (priv->has_phy)
  60                 phy_stop(dev->phydev);
  61 @@ -2338,6 +2346,7 @@ static int bcm_enetsw_stop(struct net_de
  62
  63         del_timer_sync(&priv->swphy_poll);
  64         netif_stop_queue(dev);
  65 +       netdev_reset_queue(dev);
  66         napi_disable(&priv->napi);
  67         del_timer_sync(&priv->rx_timeout);
  68