| Message ID | 5daec1ce-1956-4ed2-b2ad-9ac05627ae8f@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b8bf38440ba94e8ed8e2ae55c5dfb0276d30e843 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] r8169: enable SG/TSO on selected chip versions per default | expand |
On Thu, Oct 10, 2024 at 12:58:02PM +0200, Heiner Kallweit wrote: > 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>
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 10 Oct 2024 12:58:02 +0200 you wrote: > 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. > > [...] Here is the summary with links: - [net-next] r8169: enable SG/TSO on selected chip versions per default https://git.kernel.org/netdev/net-next/c/b8bf38440ba9 You are awesome, thank you!
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 71339910b..d90c11356 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5567,11 +5567,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 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); @@ -5582,6 +5577,17 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 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;
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> --- drivers/net/ethernet/realtek/r8169_main.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)