|
|
@@ -0,0 +1,53 @@
|
|
|
+From b56e4d660a9688ff83f5cbdc6e3ea063352d0d79 Mon Sep 17 00:00:00 2001
|
|
|
+From: Lorenzo Bianconi <[email protected]>
|
|
|
+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 <[email protected]>
|
|
|
+Signed-off-by: Lorenzo Bianconi <[email protected]>
|
|
|
+Reviewed-by: Davide Caratti <[email protected]>
|
|
|
+Link: https://patch.msgid.link/[email protected]
|
|
|
+Signed-off-by: Jakub Kicinski <[email protected]>
|
|
|
+---
|
|
|
+ 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
|
|
|
+@@ -2786,7 +2786,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;
|
|
|
+@@ -2800,7 +2800,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)
|
Christian Marangi