forked from Openwrt-EcoNet/openwrt
01d5026239
Remove upstreamed patches: bcm27xx/patches-6.6/950-0481-xhci-Use-more-event-ring-segment-table-entries.patch [1] pending-6.6/691-net-ipv6-fix-UDPv6-GSO-segmentation-with-NAT.patch [2] Manually rebased patches: generic/hack-6.6/781-usb-net-rndis-support-asr.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.90&id=f377434945f528217e65fc5b18781caeba19ce72 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.90&id=e0272844995aff8cbf2cc88b78c2b35ca51eda43 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.90&id=222b6685efe0d8c1cdb078a67bbe806f56d18f94 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/18775 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From: Chad Monroe <chad@monroe.io>
|
|
Date: Mon, 16 Sep 2024 19:29:03 -0700
|
|
Subject: [PATCH] net: ethernet: mediatek: increase QDMA RESV_BUF size
|
|
|
|
Increase QDMA RESV_BUF from 2K to 3K for netsys v2 to match Mediatek SDK[1].
|
|
This helps reduce the possibility of Ethernet transmit timeouts.
|
|
|
|
[1]: https://git01.mediatek.com/plugins/gitiles/openwrt/feeds/mtk-openwrt-feeds/+/19d8456c3051e5f6dabf42fa770916a2126ea4bf
|
|
|
|
Signed-off-by: Chad Monroe <chad@monroe.io>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 6 ++++--
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 +
|
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -279,6 +279,7 @@
|
|
#define MTK_WCOMP_EN BIT(24)
|
|
#define MTK_RESV_BUF (0x80 << 16)
|
|
#define MTK_MUTLI_CNT (0x4 << 12)
|
|
+#define MTK_RESV_BUF_MASK (0xff << 16)
|
|
#define MTK_LEAKY_BUCKET_EN BIT(11)
|
|
|
|
/* QDMA Flow Control Register */
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -3323,12 +3323,14 @@ static int mtk_start_dma(struct mtk_eth
|
|
MTK_TX_BT_32DWORDS | MTK_NDP_CO_PRO |
|
|
MTK_RX_2B_OFFSET | MTK_TX_WB_DDONE;
|
|
|
|
- if (mtk_is_netsys_v2_or_greater(eth))
|
|
+ if (mtk_is_netsys_v2_or_greater(eth)) {
|
|
+ val &= ~MTK_RESV_BUF_MASK;
|
|
val |= MTK_MUTLI_CNT | MTK_RESV_BUF |
|
|
MTK_WCOMP_EN | MTK_DMAD_WR_WDONE |
|
|
MTK_CHK_DDONE_EN;
|
|
- else
|
|
+ } else {
|
|
val |= MTK_RX_BT_32DWORDS;
|
|
+ }
|
|
mtk_w32(eth, val, reg_map->qdma.glo_cfg);
|
|
|
|
mtk_w32(eth,
|