mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 12:40:16 +04:00
Shiji Yang
8f638f9366
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.91 Remove upstreamed patches: - airoha/patches-6.12/017-v6.13-net-airoha-Implement-BQL-support.patch[1] - airoha/patches-6.12/138-v7.1-net-airoha-Add-missing-RX_CPU_IDX-configuration-in-a.patch[2] - airoha/patches-6.12/149-v7.1-net-airoha-Move-ndesc-initialization-at-end-of-airoh.patch[3] - generic/backport-6.12/940-v7.1-net-dsa-realtek-rtl8365mb-fix-mode-mask-calculation.patch[5] Manually rebased patches: - airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch[1] - ath79/patches-6.12/800-leds-add-reset-controller-based-driver.patch[4] - bcm27xx/patches-6.12/950-0122-bcmgenet-Better-coalescing-parameter-defaults.patch[6] We also backported four patches to fix perf tool regression: - generic/backport-6.12/216-01-revert-perf-cgroup-update-metric-leader-in-evlist__e.patch - generic/backport-6.12/216-02-revert-perf-tool_pmu-fix-aggregation-on-duration_tim.patch - generic/backport-6.12/216-03-revert-perf-python-add-parse_events-function.patch - generic/backport-6.12/216-04-revert-perf-tool_pmu-factor-tool-events-into-their-o.patch All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=ca24fcac1daaa5e8a667981d81986a3eb4b9fb04 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=f00037a99bc2332ef59dc85298b98b20af165904 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=d36be272adda7f313e39dd118086955d993bf6a7 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=07d3611389ba7d78b80ea360a42ce32ab2521fbc [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=3354d6c62fd4baa7b32cbd80cc5a8aa3f2bd0656 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=b84351dcc359667bc952131c1424b692ec83dce2 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/23444 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
From b56e4d660a9688ff83f5cbdc6e3ea063352d0d79 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sun, 12 Jan 2025 19:32:45 +0100
|
|
Subject: [PATCH] net: airoha: Enforce ETS Qdisc priomap
|
|
|
|
EN7581 SoC supports fixed QoS band priority where WRR queues have lowest
|
|
priorities with respect to SP ones.
|
|
E.g: WRR0, WRR1, .., WRRm, SP0, SP1, .., SPn
|
|
|
|
Enforce ETS Qdisc priomap according to the hw capabilities.
|
|
|
|
Suggested-by: Davide Caratti <dcaratti@redhat.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Davide Caratti <dcaratti@redhat.com>
|
|
Link: https://patch.msgid.link/20250112-airoha_ets_priomap-v1-1-fb616de159ba@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/airoha_eth.c | 17 +++++++++++++++--
|
|
1 file changed, 15 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/mediatek/airoha_eth.c
|
|
@@ -2806,7 +2806,7 @@ static int airoha_qdma_set_tx_ets_sched(
|
|
struct tc_ets_qopt_offload_replace_params *p = &opt->replace_params;
|
|
enum tx_sched_mode mode = TC_SCH_SP;
|
|
u16 w[AIROHA_NUM_QOS_QUEUES] = {};
|
|
- int i, nstrict = 0;
|
|
+ int i, nstrict = 0, nwrr, qidx;
|
|
|
|
if (p->bands > AIROHA_NUM_QOS_QUEUES)
|
|
return -EINVAL;
|
|
@@ -2820,7 +2820,20 @@ static int airoha_qdma_set_tx_ets_sched(
|
|
if (nstrict == AIROHA_NUM_QOS_QUEUES - 1)
|
|
return -EINVAL;
|
|
|
|
- for (i = 0; i < p->bands - nstrict; i++)
|
|
+ /* EN7581 SoC supports fixed QoS band priority where WRR queues have
|
|
+ * lowest priorities with respect to SP ones.
|
|
+ * e.g: WRR0, WRR1, .., WRRm, SP0, SP1, .., SPn
|
|
+ */
|
|
+ nwrr = p->bands - nstrict;
|
|
+ qidx = nstrict && nwrr ? nstrict : 0;
|
|
+ for (i = 1; i <= p->bands; i++) {
|
|
+ if (p->priomap[i % AIROHA_NUM_QOS_QUEUES] != qidx)
|
|
+ return -EINVAL;
|
|
+
|
|
+ qidx = i == nwrr ? 0 : qidx + 1;
|
|
+ }
|
|
+
|
|
+ for (i = 0; i < nwrr; i++)
|
|
w[i] = p->weights[nstrict + i];
|
|
|
|
if (!nstrict)
|