| Message ID | 20210914212105.76186-5-olek2@wp.pl (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 14d4e308e0aa0b78dc7a059716861a4380de3535 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,1/8] MIPS: lantiq: dma: add small delay after reset | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | warning | Series does not have a cover letter |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | warning | WARNING: line length of 91 exceeds 80 columns WARNING: line length of 98 exceeds 80 columns |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On 9/14/21 11:21 PM, Aleksander Jan Bajkowski wrote: > Configure the burst length in Ethernet drivers. 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(-) > ..... > diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c > index fb78f17d734f..5d96248ce83b 100644 > --- 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; > }; > > @@ -316,8 +319,8 @@ static netdev_tx_t xrx200_start_xmit(struct sk_buff *skb, > 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 */ > @@ -369,7 +372,7 @@ static int xrx200_dma_init(struct xrx200_priv *priv) > int ret = 0; > int i; > > - ltq_dma_init_port(DMA_PORT_ETOP); > + ltq_dma_init_port(DMA_PORT_ETOP, priv->tx_burst_len, rx_burst_len); > > ch_rx->dma.nr = XRX200_DMA_RX; > ch_rx->dma.dev = priv->dev; > @@ -478,6 +481,18 @@ static int xrx200_probe(struct platform_device *pdev) > 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; > + } > + I would prefer if you would hard code these values to 8 for the xrx200 driver. All SoCs with this IP block should support this. > /* bring up the dma engine and IP core */ > err = xrx200_dma_init(priv); > if (err) > Hauke
Hi Hauke, On 9/15/21 12:36 AM, Hauke Mehrtens wrote: > On 9/14/21 11:21 PM, Aleksander Jan Bajkowski wrote: >> Configure the burst length in Ethernet drivers. 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(-) >> > ..... >> diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c >> index fb78f17d734f..5d96248ce83b 100644 >> --- 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; >> }; >> @@ -316,8 +319,8 @@ static netdev_tx_t xrx200_start_xmit(struct sk_buff *skb, >> 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 */ >> @@ -369,7 +372,7 @@ static int xrx200_dma_init(struct xrx200_priv *priv) >> int ret = 0; >> int i; >> - ltq_dma_init_port(DMA_PORT_ETOP); >> + ltq_dma_init_port(DMA_PORT_ETOP, priv->tx_burst_len, rx_burst_len); >> ch_rx->dma.nr = XRX200_DMA_RX; >> ch_rx->dma.dev = priv->dev; >> @@ -478,6 +481,18 @@ static int xrx200_probe(struct platform_device *pdev) >> 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; >> + } >> + > > I would prefer if you would hard code these values to 8 for the xrx200 driver. All SoCs with this IP block should support this. OK. I can hard code 8W burst length in the driver for xrx200. Burst length as a configurable parameter is really only needed in the lantiq_etop driver. > >> /* bring up the dma engine and IP core */ >> err = xrx200_dma_init(priv); >> if (err) >> > > Hauke Aleksander
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 62f8c5212182..2258e3f19161 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -96,6 +96,9 @@ struct ltq_etop_priv { struct ltq_etop_chan ch[MAX_DMA_CHAN]; int tx_free[MAX_DMA_CHAN >> 1]; + int tx_burst_len; + int rx_burst_len; + spinlock_t lock; }; @@ -259,7 +262,7 @@ ltq_etop_hw_init(struct net_device *dev) /* enable crc generation */ ltq_etop_w32(PPE32_CGEN, LQ_PPE32_ENET_MAC_CFG); - ltq_dma_init_port(DMA_PORT_ETOP); + ltq_dma_init_port(DMA_PORT_ETOP, priv->tx_burst_len, rx_burst_len); for (i = 0; i < MAX_DMA_CHAN; i++) { int irq = LTQ_DMA_CH0_INT + i; @@ -472,8 +475,8 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) 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); ch->skb[ch->dma.desc] = skb; netif_trans_update(dev); @@ -667,6 +670,18 @@ ltq_etop_probe(struct platform_device *pdev) 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; + } + for (i = 0; i < MAX_DMA_CHAN; i++) { if (IS_TX(i)) netif_napi_add(dev, &priv->ch[i].napi, diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c index fb78f17d734f..5d96248ce83b 100644 --- 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; }; @@ -316,8 +319,8 @@ static netdev_tx_t xrx200_start_xmit(struct sk_buff *skb, 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 */ @@ -369,7 +372,7 @@ static int xrx200_dma_init(struct xrx200_priv *priv) int ret = 0; int i; - ltq_dma_init_port(DMA_PORT_ETOP); + ltq_dma_init_port(DMA_PORT_ETOP, priv->tx_burst_len, rx_burst_len); ch_rx->dma.nr = XRX200_DMA_RX; ch_rx->dma.dev = priv->dev; @@ -478,6 +481,18 @@ static int xrx200_probe(struct platform_device *pdev) 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)
Configure the burst length in Ethernet drivers. 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(-)