lantiq: improve ethernet performance

[openwrt/openwrt.git] / target / linux / lantiq / patches-5.4 / 0710-net-lantiq-configure-burst-length-for-ethernet.patch

diff --git a/target/linux/lantiq/patches-5.4/0710-net-lantiq-configure-burst-length-for-ethernet.patch b/target/linux/lantiq/patches-5.4/0710-net-lantiq-configure-burst-length-for-ethernet.patch
new file mode 100644 (file)
index 0000000..746a09c
--- /dev/null
+++ b/target/linux/lantiq/patches-5.4/0710-net-lantiq-configure-burst-length-for-ethernet.patch
@@ -0,0 +1,124 @@
+From ec1a17a11aced3cd756e59d91ad6f50b7a2fabfb Mon Sep 17 00:00:00 2001
+From: Aleksander Jan Bajkowski <olek2@wp.pl>
+Date: Sun, 16 May 2021 15:52:06 +0200
+Subject: [PATCH 5/5] net: lantiq: configure burst length for ethernet
+
+Configure the burst length for Ethernet. This improves Ethernet
+performance by 58%. According to the vendor BSP, 8W burst length
+is supported by ar9 and newer SoCs.
+
+The NAT benchmark results on xRX200 (Down/Up):
+* 2W: 330 Mb/s
+* 4W: 432 Mb/s    372 Mb/s
+* 8W: 520 Mb/s    389 Mb/s
+
+Tested on xRX200 and xRX330.
+
+Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
+---
+ drivers/net/ethernet/lantiq_etop.c   | 21 ++++++++++++++++++---
+ drivers/net/ethernet/lantiq_xrx200.c | 21 ++++++++++++++++++---
+ 2 files changed, 36 insertions(+), 6 deletions(-)
+
+--- a/drivers/net/ethernet/lantiq_etop.c
++++ b/drivers/net/ethernet/lantiq_etop.c
+@@ -148,6 +148,9 @@ struct ltq_etop_priv {
+       struct ltq_etop_chan txch;
+       struct ltq_etop_chan rxch;
+ 
++      int tx_burst_len;
++      int rx_burst_len;
++
+       int tx_irq;
+       int rx_irq;
+ 
+@@ -399,7 +402,7 @@ ltq_etop_dma_init(struct net_device *dev
+       int rx = priv->rx_irq - LTQ_DMA_ETOP;
+       int err;
+ 
+-      ltq_dma_init_port(DMA_PORT_ETOP);
++      ltq_dma_init_port(DMA_PORT_ETOP, priv->tx_burst_len, priv->rx_burst_len);
+ 
+       priv->txch.dma.nr = tx;
+       priv->txch.dma.dev = &priv->pdev->dev;
+@@ -676,8 +679,8 @@ ltq_etop_tx(struct sk_buff *skb, struct
+               return NETDEV_TX_BUSY;
+       }
+ 
+-      /* dma needs to start on a 16 byte aligned address */
+-      byte_offset = CPHYSADDR(skb->data) % 16;
++      /* dma needs to start on a burst length value aligned address */
++      byte_offset = CPHYSADDR(skb->data) % (priv->tx_burst_len * 4);
+       priv->txch.skb[priv->txch.dma.desc] = skb;
+ 
+       netif_trans_update(dev);
+@@ -930,6 +933,18 @@ static int ltq_etop_probe(struct platfor
+       spin_lock_init(&priv->lock);
+       SET_NETDEV_DEV(dev, &pdev->dev);
+ 
++      err = device_property_read_u32(&pdev->dev, "lantiq,tx-burst-length", &priv->tx_burst_len);
++      if (err < 0) {
++              dev_err(&pdev->dev, "unable to read tx-burst-length property\n");
++              return err;
++      }
++
++      err = device_property_read_u32(&pdev->dev, "lantiq,rx-burst-length", &priv->rx_burst_len);
++      if (err < 0) {
++              dev_err(&pdev->dev, "unable to read rx-burst-length property\n");
++              return err;
++      }
++
+       netif_napi_add(dev, &priv->txch.napi, ltq_etop_poll_tx, 8);
+       netif_napi_add(dev, &priv->rxch.napi, ltq_etop_poll_rx, 32);
+       priv->txch.netdev = dev;
+--- a/drivers/net/ethernet/lantiq_xrx200.c
++++ b/drivers/net/ethernet/lantiq_xrx200.c
+@@ -71,6 +71,9 @@ struct xrx200_priv {
+       struct net_device *net_dev;
+       struct device *dev;
+ 
++      int tx_burst_len;
++      int rx_burst_len;
++
+       __iomem void *pmac_reg;
+ };
+ 
+@@ -315,8 +318,8 @@ static int xrx200_start_xmit(struct sk_b
+       if (unlikely(dma_mapping_error(priv->dev, mapping)))
+               goto err_drop;
+ 
+-      /* dma needs to start on a 16 byte aligned address */
+-      byte_offset = mapping % 16;
++      /* dma needs to start on a burst length value aligned address */
++      byte_offset = mapping % (priv->tx_burst_len * 4);
+ 
+       desc->addr = mapping - byte_offset;
+       /* Make sure the address is written before we give it to HW */
+@@ -368,7 +371,7 @@ static int xrx200_dma_init(struct xrx200
+       int ret = 0;
+       int i;
+ 
+-      ltq_dma_init_port(DMA_PORT_ETOP);
++      ltq_dma_init_port(DMA_PORT_ETOP, priv->tx_burst_len, priv->rx_burst_len);
+ 
+       ch_rx->dma.nr = XRX200_DMA_RX;
+       ch_rx->dma.dev = priv->dev;
+@@ -486,6 +489,18 @@ static int xrx200_probe(struct platform_
+       if (err)
+               eth_hw_addr_random(net_dev);
+ 
++      err = device_property_read_u32(dev, "lantiq,tx-burst-length", &priv->tx_burst_len);
++      if (err < 0) {
++              dev_err(dev, "unable to read tx-burst-length property\n");
++              return err;
++      }
++
++      err = device_property_read_u32(dev, "lantiq,rx-burst-length", &priv->rx_burst_len);
++      if (err < 0) {
++              dev_err(dev, "unable to read rx-burst-length property\n");
++              return err;
++      }
++
+       /* bring up the dma engine and IP core */
+       err = xrx200_dma_init(priv);
+       if (err)