mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 17:35:49 +00:00
d62ecd6c07
Refresh patches 6.12 for airoha and econet Fixes:122135b964("airoha: an7581: add support for kernel 6.12") Fixes:73d0f92460("kernel: Add new platform EcoNet MIPS") Signed-off-by: Leo Barsky <leobrsky@proton.me> Link: https://github.com/openwrt/openwrt/pull/20073 Signed-off-by: Robert Marko <robimarko@gmail.com>
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
|
|
@@ -2785,7 +2785,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;
|
|
@@ -2799,7 +2799,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)
|