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>
87 lines
3.3 KiB
Diff
87 lines
3.3 KiB
Diff
From 2b288b81560b94958cd68bbe54673e55a1730c95 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 3 Jan 2025 13:17:03 +0100
|
|
Subject: [PATCH 2/4] net: airoha: Introduce ndo_select_queue callback
|
|
|
|
Airoha EN7581 SoC supports 32 Tx DMA rings used to feed packets to QoS
|
|
channels. Each channels supports 8 QoS queues where the user can apply
|
|
QoS scheduling policies. In a similar way, the user can configure hw
|
|
rate shaping for each QoS channel.
|
|
Introduce ndo_select_queue callback in order to select the tx queue
|
|
based on QoS channel and QoS queue. In particular, for dsa device select
|
|
QoS channel according to the dsa user port index, rely on port id
|
|
otherwise. Select QoS queue based on the skb priority.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/mediatek/airoha_eth.c | 30 ++++++++++++++++++++--
|
|
1 file changed, 28 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/mediatek/airoha_eth.c
|
|
@@ -23,6 +23,8 @@
|
|
#define AIROHA_MAX_NUM_XSI_RSTS 5
|
|
#define AIROHA_MAX_MTU 2000
|
|
#define AIROHA_MAX_PACKET_SIZE 2048
|
|
+#define AIROHA_NUM_QOS_CHANNELS 4
|
|
+#define AIROHA_NUM_QOS_QUEUES 8
|
|
#define AIROHA_NUM_TX_RING 32
|
|
#define AIROHA_NUM_RX_RING 32
|
|
#define AIROHA_FE_MC_MAX_VLAN_TABLE 64
|
|
@@ -2442,21 +2444,44 @@ static void airoha_dev_get_stats64(struc
|
|
} while (u64_stats_fetch_retry(&port->stats.syncp, start));
|
|
}
|
|
|
|
+static u16 airoha_dev_select_queue(struct net_device *dev, struct sk_buff *skb,
|
|
+ struct net_device *sb_dev)
|
|
+{
|
|
+ struct airoha_gdm_port *port = netdev_priv(dev);
|
|
+ int queue, channel;
|
|
+
|
|
+ /* For dsa device select QoS channel according to the dsa user port
|
|
+ * index, rely on port id otherwise. Select QoS queue based on the
|
|
+ * skb priority.
|
|
+ */
|
|
+ channel = netdev_uses_dsa(dev) ? skb_get_queue_mapping(skb) : port->id;
|
|
+ channel = channel % AIROHA_NUM_QOS_CHANNELS;
|
|
+ queue = (skb->priority - 1) % AIROHA_NUM_QOS_QUEUES; /* QoS queue */
|
|
+ queue = channel * AIROHA_NUM_QOS_QUEUES + queue;
|
|
+
|
|
+ return queue < dev->num_tx_queues ? queue : 0;
|
|
+}
|
|
+
|
|
static netdev_tx_t airoha_dev_xmit(struct sk_buff *skb,
|
|
struct net_device *dev)
|
|
{
|
|
struct skb_shared_info *sinfo = skb_shinfo(skb);
|
|
struct airoha_gdm_port *port = netdev_priv(dev);
|
|
- u32 msg0 = 0, msg1, len = skb_headlen(skb);
|
|
- int i, qid = skb_get_queue_mapping(skb);
|
|
+ u32 msg0, msg1, len = skb_headlen(skb);
|
|
struct airoha_qdma *qdma = port->qdma;
|
|
u32 nr_frags = 1 + sinfo->nr_frags;
|
|
struct netdev_queue *txq;
|
|
struct airoha_queue *q;
|
|
void *data = skb->data;
|
|
+ int i, qid;
|
|
u16 index;
|
|
u8 fport;
|
|
|
|
+ qid = skb_get_queue_mapping(skb) % ARRAY_SIZE(qdma->q_tx);
|
|
+ msg0 = FIELD_PREP(QDMA_ETH_TXMSG_CHAN_MASK,
|
|
+ qid / AIROHA_NUM_QOS_QUEUES) |
|
|
+ FIELD_PREP(QDMA_ETH_TXMSG_QUEUE_MASK,
|
|
+ qid % AIROHA_NUM_QOS_QUEUES);
|
|
if (skb->ip_summed == CHECKSUM_PARTIAL)
|
|
msg0 |= FIELD_PREP(QDMA_ETH_TXMSG_TCO_MASK, 1) |
|
|
FIELD_PREP(QDMA_ETH_TXMSG_UCO_MASK, 1) |
|
|
@@ -2630,6 +2655,7 @@ static const struct net_device_ops airoh
|
|
.ndo_init = airoha_dev_init,
|
|
.ndo_open = airoha_dev_open,
|
|
.ndo_stop = airoha_dev_stop,
|
|
+ .ndo_select_queue = airoha_dev_select_queue,
|
|
.ndo_start_xmit = airoha_dev_xmit,
|
|
.ndo_get_stats64 = airoha_dev_get_stats64,
|
|
.ndo_set_mac_address = airoha_dev_set_macaddr,
|