mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
b04f245c39
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.23 Removed upstreamed: pending-6.6/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch[1] pending-6.6/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch[2] mediatek/patches-6.6/232-clk-mediatek-mt7981-topckgen-flag-SGM_REG_SEL-as-cri.patch[3] Manually rebased: mediatek/patches-6.6/100-dts-update-mt7622-rfb1.patch Added: generic/backports-6.6/981-mtd-spinand-Add-support-for-5-byte-IDs.patch[4] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=1f32abb474c1c9bdb21d9eda74c325a0b3a162e5 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=943c14ece95eb1cf98d477462aebcbfdfd714633 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=6ff01b314149d1cf59caebc29384f0beed21cba4 4. See comments in https://github.com/openwrt/openwrt/pull/14992 regarding broken flogic/xiaomi_redmi-router-ax6000-ubootmod Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, flogic/glinet_gl-mt6000 Run-tested: x86/64/AMD Cezannei, flogic/xiaomi_redmi-router-ax6000-ubootmod, flogic/glinet_gl-mt6000 Signed-off-by: John Audia <therealgraysky@proton.me>
103 lines
2.8 KiB
Diff
103 lines
2.8 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Thu, 3 Nov 2022 12:38:49 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: work around issue with sending
|
|
small fragments
|
|
|
|
When lots of frames are sent with a number of very small fragments, an
|
|
internal FIFO can overflow, causing the DMA engine to lock up lock up and
|
|
transmit attempts time out.
|
|
|
|
Fix this on MT7986 by increasing the reserved FIFO space.
|
|
Fix this on older chips by detecting the presence of small fragments and use
|
|
skb_gso_segment + skb_linearize to deal with them.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -26,6 +26,7 @@
|
|
#include <linux/bitfield.h>
|
|
#include <net/dsa.h>
|
|
#include <net/dst_metadata.h>
|
|
+#include <net/gso.h>
|
|
#include <net/page_pool/helpers.h>
|
|
|
|
#include "mtk_eth_soc.h"
|
|
@@ -1578,12 +1579,28 @@ static void mtk_wake_queue(struct mtk_et
|
|
}
|
|
}
|
|
|
|
+static bool mtk_skb_has_small_frag(struct sk_buff *skb)
|
|
+{
|
|
+ int min_size = 16;
|
|
+ int i;
|
|
+
|
|
+ if (skb_headlen(skb) < min_size)
|
|
+ return true;
|
|
+
|
|
+ for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
|
|
+ if (skb_frag_size(&skb_shinfo(skb)->frags[i]) < min_size)
|
|
+ return true;
|
|
+
|
|
+ return false;
|
|
+}
|
|
+
|
|
static netdev_tx_t mtk_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
{
|
|
struct mtk_mac *mac = netdev_priv(dev);
|
|
struct mtk_eth *eth = mac->hw;
|
|
struct mtk_tx_ring *ring = ð->tx_ring;
|
|
struct net_device_stats *stats = &dev->stats;
|
|
+ struct sk_buff *segs, *next;
|
|
bool gso = false;
|
|
int tx_num;
|
|
|
|
@@ -1605,6 +1622,18 @@ static netdev_tx_t mtk_start_xmit(struct
|
|
return NETDEV_TX_BUSY;
|
|
}
|
|
|
|
+ if (mtk_is_netsys_v1(eth) &&
|
|
+ skb_is_gso(skb) && mtk_skb_has_small_frag(skb)) {
|
|
+ segs = skb_gso_segment(skb, dev->features & ~NETIF_F_ALL_TSO);
|
|
+ if (IS_ERR(segs))
|
|
+ goto drop;
|
|
+
|
|
+ if (segs) {
|
|
+ consume_skb(skb);
|
|
+ skb = segs;
|
|
+ }
|
|
+ }
|
|
+
|
|
/* TSO: fill MSS info in tcp checksum field */
|
|
if (skb_is_gso(skb)) {
|
|
if (skb_cow_head(skb, 0)) {
|
|
@@ -1620,8 +1649,14 @@ static netdev_tx_t mtk_start_xmit(struct
|
|
}
|
|
}
|
|
|
|
- if (mtk_tx_map(skb, dev, tx_num, ring, gso) < 0)
|
|
- goto drop;
|
|
+ skb_list_walk_safe(skb, skb, next) {
|
|
+ if ((mtk_is_netsys_v1(eth) &&
|
|
+ mtk_skb_has_small_frag(skb) && skb_linearize(skb)) ||
|
|
+ mtk_tx_map(skb, dev, tx_num, ring, gso) < 0) {
|
|
+ stats->tx_dropped++;
|
|
+ dev_kfree_skb_any(skb);
|
|
+ }
|
|
+ }
|
|
|
|
if (unlikely(atomic_read(&ring->free_count) <= ring->thresh))
|
|
netif_tx_stop_all_queues(dev);
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -268,7 +268,7 @@
|
|
#define MTK_CHK_DDONE_EN BIT(28)
|
|
#define MTK_DMAD_WR_WDONE BIT(26)
|
|
#define MTK_WCOMP_EN BIT(24)
|
|
-#define MTK_RESV_BUF (0x40 << 16)
|
|
+#define MTK_RESV_BUF (0x80 << 16)
|
|
#define MTK_MUTLI_CNT (0x4 << 12)
|
|
#define MTK_LEAKY_BUCKET_EN BIT(11)
|
|
|