bcm4908: backport upstream BQL support for bcm4908_enet

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

diff --git a/target/linux/bcm4908/patches-5.10/079-v6.2-0002-net-broadcom-bcm4908_enet-report-queued-and-transmit.patch b/target/linux/bcm4908/patches-5.10/079-v6.2-0002-net-broadcom-bcm4908_enet-report-queued-and-transmit.patch
new file mode 100644 (file)
index 0000000..9f85a77
--- /dev/null
+++ b/target/linux/bcm4908/patches-5.10/079-v6.2-0002-net-broadcom-bcm4908_enet-report-queued-and-transmit.patch
@@ -0,0 +1,45 @@
+From 471ef777ec79baadc5cd9773d08f95f49cf5e2b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Mon, 31 Oct 2022 11:48:56 +0100
+Subject: [PATCH] net: broadcom: bcm4908_enet: report queued and transmitted
+ bytes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows BQL to operate avoiding buffer bloat and reducing latency.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Link: https://lore.kernel.org/r/20221031104856.32388-1-zajec5@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+---
+ drivers/net/ethernet/broadcom/bcm4908_enet.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
+@@ -504,6 +504,7 @@ static int bcm4908_enet_stop(struct net_
+       netif_carrier_off(netdev);
+       napi_disable(&rx_ring->napi);
+       napi_disable(&tx_ring->napi);
++      netdev_reset_queue(netdev);
+ 
+       bcm4908_enet_dma_rx_ring_disable(enet, &enet->rx_ring);
+       bcm4908_enet_dma_tx_ring_disable(enet, &enet->tx_ring);
+@@ -563,6 +564,8 @@ static int bcm4908_enet_start_xmit(struc
+       if (ring->write_idx + 1 == ring->length - 1)
+               tmp |= DMA_CTL_STATUS_WRAP;
+ 
++      netdev_sent_queue(enet->netdev, skb->len);
++
+       buf_desc->addr = cpu_to_le32((uint32_t)slot->dma_addr);
+       buf_desc->ctl = cpu_to_le32(tmp);
+ 
+@@ -670,6 +673,7 @@ static int bcm4908_enet_poll_tx(struct n
+                       tx_ring->read_idx = 0;
+       }
+ 
++      netdev_completed_queue(enet->netdev, handled, bytes);
+       enet->netdev->stats.tx_packets += handled;
+       enet->netdev->stats.tx_bytes += bytes;
+ 

diff --git a/target/linux/bcm4908/patches-5.10/170-net-broadcom-bcm4908_enet-report-queued-and-transmit.patch b/target/linux/bcm4908/patches-5.10/170-net-broadcom-bcm4908_enet-report-queued-and-transmit.patch
deleted file mode 100644 (file)
index cd01c91..0000000
--- a/target/linux/bcm4908/patches-5.10/170-net-broadcom-bcm4908_enet-report-queued-and-transmit.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 27 Oct 2022 22:18:05 +0200
-Subject: [PATCH] net: broadcom: bcm4908_enet: report queued and transmitted
- bytes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows BQL to operate avoiding buffer bloat and reducing latency.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
----
- drivers/net/ethernet/broadcom/bcm4908_enet.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
-@@ -504,6 +504,7 @@ static int bcm4908_enet_stop(struct net_
-       netif_carrier_off(netdev);
-       napi_disable(&rx_ring->napi);
-       napi_disable(&tx_ring->napi);
-+      netdev_reset_queue(netdev);
- 
-       bcm4908_enet_dma_rx_ring_disable(enet, &enet->rx_ring);
-       bcm4908_enet_dma_tx_ring_disable(enet, &enet->tx_ring);
-@@ -563,6 +564,8 @@ static int bcm4908_enet_start_xmit(struc
-       if (ring->write_idx + 1 == ring->length - 1)
-               tmp |= DMA_CTL_STATUS_WRAP;
- 
-+      netdev_sent_queue(enet->netdev, skb->len);
-+
-       buf_desc->addr = cpu_to_le32((uint32_t)slot->dma_addr);
-       buf_desc->ctl = cpu_to_le32(tmp);
- 
-@@ -670,6 +673,7 @@ static int bcm4908_enet_poll_tx(struct n
-                       tx_ring->read_idx = 0;
-       }
- 
-+      netdev_completed_queue(enet->netdev, handled, bytes);
-       enet->netdev->stats.tx_packets += handled;
-       enet->netdev->stats.tx_bytes += bytes;
-