r8169: change back SG and TSO to be disabled by default

BugLink: https://bugs.launchpad.net/bugs/1873292
[ Upstream commit 95099c569a9fdbe186a27447dfa8a5a0562d4b7f ]

There has been a number of reports that using SG/TSO on different chip
versions 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!

Fixes: 93681cd7d94f ("r8169: enable HW csum and TSO")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 7cf1bcbd59eb1f292850ac8a7518a03e063cad42..67ec833fb18c96820be6afa1211ec0fd076b2666 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -7166,12 +7166,10 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        netif_napi_add(dev, &tp->napi, rtl8169_poll, NAPI_POLL_WEIGHT);
 
-       dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
-               NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX |
-               NETIF_F_HW_VLAN_CTAG_RX;
-       dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
-               NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX |
-               NETIF_F_HW_VLAN_CTAG_RX;
+       dev->features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
+                        NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
+       dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
+                          NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
        dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
                NETIF_F_HIGHDMA;
        dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
@@ -7189,25 +7187,25 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                dev->hw_features &= ~NETIF_F_HW_VLAN_CTAG_RX;
 
        if (rtl_chip_supports_csum_v2(tp)) {
-               dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
-               dev->features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
+               dev->hw_features |= NETIF_F_IPV6_CSUM;
+               dev->features |= NETIF_F_IPV6_CSUM;
+       }
+
+       /* 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;
                dev->gso_max_size = RTL_GSO_MAX_SIZE_V2;
                dev->gso_max_segs = RTL_GSO_MAX_SEGS_V2;
        } else {
+               dev->hw_features |= NETIF_F_SG | NETIF_F_TSO;
                dev->gso_max_size = RTL_GSO_MAX_SIZE_V1;
                dev->gso_max_segs = RTL_GSO_MAX_SEGS_V1;
        }
 
-       /* RTL8168e-vl and one RTL8168c variant are known to have a
-        * HW issue with TSO.
-        */
-       if (tp->mac_version == RTL_GIGA_MAC_VER_34 ||
-           tp->mac_version == RTL_GIGA_MAC_VER_22) {
-               dev->vlan_features &= ~(NETIF_F_ALL_TSO | NETIF_F_SG);
-               dev->hw_features &= ~(NETIF_F_ALL_TSO | NETIF_F_SG);
-               dev->features &= ~(NETIF_F_ALL_TSO | NETIF_F_SG);
-       }
-
        dev->hw_features |= NETIF_F_RXALL;
        dev->hw_features |= NETIF_F_RXFCS;