forked from Openwrt-EcoNet/openwrt
a878dd24e7
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.93 Removed upstreamed: backport-6.6/780-51-v6.15-r8169-don-t-scan-PHY-addresses-0.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.93&id=961ee132104b09e054308e53d8ab4a2386a21904 Build system: x86/64 Build-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Run-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/19026 Signed-off-by: Nick Hainke <vincent@systemli.org>
53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
From b8bf38440ba94e8ed8e2ae55c5dfb0276d30e843 Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Thu, 10 Oct 2024 12:58:02 +0200
|
|
Subject: [PATCH] r8169: enable SG/TSO on selected chip versions per default
|
|
|
|
Due to problem reports in the past SG and TSO/TSO6 are disabled per
|
|
default. It's not fully clear which chip versions are affected, so we
|
|
may impact also users of unaffected chip versions, unless they know
|
|
how to use ethtool for enabling SG/TSO/TSO6.
|
|
Vendor drivers r8168/r8125 enable SG/TSO/TSO6 for selected chip
|
|
versions per default, I'd interpret this as confirmation that these
|
|
chip versions are unaffected. So let's do the same here.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_main.c | 16 +++++++++++-----
|
|
1 file changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -5492,11 +5492,6 @@ static int rtl_init_one(struct pci_dev *
|
|
|
|
dev->features |= dev->hw_features;
|
|
|
|
- /* There has been a number of reports that using SG/TSO results in
|
|
- * tx timeouts. However for a lot of people SG/TSO works fine.
|
|
- * Therefore disable both features by default, but allow users to
|
|
- * enable them. Use at own risk!
|
|
- */
|
|
if (rtl_chip_supports_csum_v2(tp)) {
|
|
dev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6;
|
|
netif_set_tso_max_size(dev, RTL_GSO_MAX_SIZE_V2);
|
|
@@ -5507,6 +5502,17 @@ static int rtl_init_one(struct pci_dev *
|
|
netif_set_tso_max_segs(dev, RTL_GSO_MAX_SEGS_V1);
|
|
}
|
|
|
|
+ /* There has been a number of reports that using SG/TSO results in
|
|
+ * tx timeouts. However for a lot of people SG/TSO works fine.
|
|
+ * It's not fully clear which chip versions are affected. Vendor
|
|
+ * drivers enable SG/TSO for certain chip versions per default,
|
|
+ * let's mimic this here. On other chip versions users can
|
|
+ * use ethtool to enable SG/TSO, use at own risk!
|
|
+ */
|
|
+ if (tp->mac_version >= RTL_GIGA_MAC_VER_46 &&
|
|
+ tp->mac_version != RTL_GIGA_MAC_VER_61)
|
|
+ dev->features |= dev->hw_features;
|
|
+
|
|
dev->hw_features |= NETIF_F_RXALL;
|
|
dev->hw_features |= NETIF_F_RXFCS;
|
|
|