mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 12:40:16 +04:00
Shiji Yang
9cf794cff1
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
(cherry picked from commit 8f638f9366)
Link: https://github.com/openwrt/openwrt/pull/23538
[Adapted to patches in 25.12]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
61 lines
2.4 KiB
Diff
61 lines
2.4 KiB
Diff
From c6287e1a858e336cc202b484c6138a0fe252c6b3 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Thu, 13 Feb 2025 16:34:20 +0100
|
|
Subject: [PATCH] net: airoha: Fix TSO support for header cloned skbs
|
|
|
|
For GSO packets, skb_cow_head() will reallocate the skb for TSO header
|
|
cloned skbs in airoha_dev_xmit(). For this reason, sinfo pointer can be
|
|
no more valid. Fix the issue relying on skb_shinfo() macro directly in
|
|
airoha_dev_xmit().
|
|
|
|
The problem exists since
|
|
commit 23020f049327 ("net: airoha: Introduce ethernet support for EN7581 SoC")
|
|
but it is not a user visible, since we can't currently enable TSO
|
|
for DSA user ports since we are missing to initialize net_device
|
|
vlan_features field.
|
|
|
|
Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20250213-airoha-en7581-flowtable-offload-v4-1-b69ca16d74db@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/airoha_eth.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/mediatek/airoha_eth.c
|
|
@@ -2569,11 +2569,10 @@ static u16 airoha_dev_select_queue(struc
|
|
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 nr_frags = 1 + skb_shinfo(skb)->nr_frags;
|
|
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;
|
|
@@ -2596,8 +2595,9 @@ static netdev_tx_t airoha_dev_xmit(struc
|
|
if (skb_cow_head(skb, 0))
|
|
goto error;
|
|
|
|
- if (sinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) {
|
|
- __be16 csum = cpu_to_be16(sinfo->gso_size);
|
|
+ if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 |
|
|
+ SKB_GSO_TCPV6)) {
|
|
+ __be16 csum = cpu_to_be16(skb_shinfo(skb)->gso_size);
|
|
|
|
tcp_hdr(skb)->check = (__force __sum16)csum;
|
|
msg0 |= FIELD_PREP(QDMA_ETH_TXMSG_TSO_MASK, 1);
|
|
@@ -2626,7 +2626,7 @@ static netdev_tx_t airoha_dev_xmit(struc
|
|
for (i = 0; i < nr_frags; i++) {
|
|
struct airoha_qdma_desc *desc = &q->desc[index];
|
|
struct airoha_queue_entry *e = &q->entry[index];
|
|
- skb_frag_t *frag = &sinfo->frags[i];
|
|
+ skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
|
|
dma_addr_t addr;
|
|
u32 val;
|
|
|