mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 12:40:16 +04:00
John Audia
b00d26376e
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.81
Removed upstreamed:
ramips/patches-6.12/100-mips-ralink-update-CPU-clock-index.patch[1]
airoha/patches-6.12/135-v7.1-net-airoha-Add-missing-cleanup-bits-in-airoha_qdma_c.patch[2]
Manually rebased:
airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.81&id=e8fd60338545f4bc9c23d3d4686c88324aa76fb8
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.81&id=cce5027f9dc3a333ccbcd59a2c3ab2906bd08d30
Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/22913
[Modify airoha move patch]
(cherry picked from commit 8d827ccc93)
Link: https://github.com/openwrt/openwrt/pull/23162
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 1d304174106c93ce05f6088813ad7203b3eb381a Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sat, 12 Oct 2024 11:01:11 +0200
|
|
Subject: [PATCH] net: airoha: Implement BQL support
|
|
|
|
Introduce BQL support in the airoha_eth driver reporting to the kernel
|
|
info about tx hw DMA queues in order to avoid bufferbloat and keep the
|
|
latency small.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20241012-en7581-bql-v2-1-4deb4efdb60b@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/airoha_eth.c | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/mediatek/airoha_eth.c
|
|
@@ -1729,9 +1729,11 @@ static int airoha_qdma_tx_napi_poll(stru
|
|
WRITE_ONCE(desc->msg1, 0);
|
|
|
|
if (skb) {
|
|
+ u16 queue = skb_get_queue_mapping(skb);
|
|
struct netdev_queue *txq;
|
|
|
|
- txq = netdev_get_tx_queue(skb->dev, qid);
|
|
+ txq = netdev_get_tx_queue(skb->dev, queue);
|
|
+ netdev_tx_completed_queue(txq, 1, skb->len);
|
|
if (netif_tx_queue_stopped(txq) &&
|
|
q->ndesc - q->queued >= q->free_thr)
|
|
netif_tx_wake_queue(txq);
|
|
@@ -2510,7 +2512,9 @@ static netdev_tx_t airoha_dev_xmit(struc
|
|
q->queued += i;
|
|
|
|
skb_tx_timestamp(skb);
|
|
- if (!netdev_xmit_more())
|
|
+ netdev_tx_sent_queue(txq, skb->len);
|
|
+
|
|
+ if (netif_xmit_stopped(txq) || !netdev_xmit_more())
|
|
airoha_qdma_rmw(qdma, REG_TX_CPU_IDX(qid),
|
|
TX_RING_CPU_IDX_MASK,
|
|
FIELD_PREP(TX_RING_CPU_IDX_MASK, q->head));
|