d59d69f9e1
Manually rebased:
backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
Removed upstreamed:
backport-5.15/060-v6.0-01-tools-build-Add-feature-test-for-init_disassemble_in.patch[1]
backport-5.15/060-v6.0-02-tools-include-add-dis-asm-compat.h-to-handle-version.patch[2]
backport-5.15/060-v6.0-03-tools-perf-Fix-compilation-error-with-new-binutils.patch[3]
backport-5.15/060-v6.0-04-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch[4]
backport-5.15/060-v6.0-05-tools-bpftool-Fix-compilation-error-with-new-binutil.patch[5]
pending-5.15/733-02-net-ethernet-mtk_eth_soc-fix-RX-data-corruption-issu.patch[6]
bcm47xx/patches-5.15/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[7]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=51b99dc38c1a053e2e732d7f9e2740e343ae7eae
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=451c9d7b16169645ed291ebb2ca9844caa088f2d
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=97f005c0bdbaf656a7808586d234965385a06c58
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=1c27fab243333821375e4d63128d60093fdbe149
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=4441a90091931fd81607567961dc122f24f735bb
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=2adc29350a5b4669544566f71f208d2abaec60ab
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=04bfc5bcdfc0fdb73587487c71b04d63807ae15a
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
From 266836133cde4a88c7cc5b39b3e18355ae9b1b3d Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Wed, 13 Jun 2018 15:21:10 +0100
|
|
Subject: [PATCH] net: lan78xx: Disable TCP Segmentation Offload (TSO)
|
|
|
|
TSO seems to be having issues when packets are dropped and the
|
|
remote end uses Selective Acknowledge (SACK) to denote that
|
|
data is missing. The missing data is never resent, so the
|
|
connection eventually stalls.
|
|
|
|
There is a module parameter of enable_tso added to allow
|
|
further debugging without forcing a rebuild of the kernel.
|
|
|
|
https://github.com/raspberrypi/linux/issues/2449
|
|
https://github.com/raspberrypi/linux/issues/2482
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/net/usb/lan78xx.c | 19 +++++++++++++++++--
|
|
1 file changed, 17 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/usb/lan78xx.c
|
|
+++ b/drivers/net/usb/lan78xx.c
|
|
@@ -445,6 +445,15 @@ static int msg_level = -1;
|
|
module_param(msg_level, int, 0);
|
|
MODULE_PARM_DESC(msg_level, "Override default message level");
|
|
|
|
+/* TSO seems to be having some issue with Selective Acknowledge (SACK) that
|
|
+ * results in lost data never being retransmitted.
|
|
+ * Disable it by default now, but adds a module parameter to enable it for
|
|
+ * debug purposes (the full cause is not currently understood).
|
|
+ */
|
|
+static bool enable_tso;
|
|
+module_param(enable_tso, bool, 0644);
|
|
+MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload");
|
|
+
|
|
static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
|
|
{
|
|
u32 *buf;
|
|
@@ -3263,8 +3272,14 @@ static int lan78xx_bind(struct lan78xx_n
|
|
if (DEFAULT_RX_CSUM_ENABLE)
|
|
dev->net->features |= NETIF_F_RXCSUM;
|
|
|
|
- if (DEFAULT_TSO_CSUM_ENABLE)
|
|
- dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG;
|
|
+ if (DEFAULT_TSO_CSUM_ENABLE) {
|
|
+ dev->net->features |= NETIF_F_SG;
|
|
+ /* Use module parameter to control TCP segmentation offload as
|
|
+ * it appears to cause issues.
|
|
+ */
|
|
+ if (enable_tso)
|
|
+ dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6;
|
|
+ }
|
|
|
|
if (DEFAULT_VLAN_RX_OFFLOAD)
|
|
dev->net->features |= NETIF_F_HW_VLAN_CTAG_RX;
|