[kernel] r22254 - in dists/sid/linux/debian: . patches patches/bugfix/all

[Ian James Campbell]

Author: ijc
Date: Mon Jan 12 14:27:33 2015
New Revision: 22254

Log:
Disable TSO in mv643xx_eth driver by default again

Since previous fix appears to not work on all platforms (Closes: #764162).

Added:
   dists/sid/linux/debian/patches/bugfix/all/net-mv643xx-disable-tso-by-default.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Mon Jan 12 05:49:17 2015	(r22253)
+++ dists/sid/linux/debian/changelog	Mon Jan 12 14:27:33 2015	(r22254)
@@ -148,6 +148,8 @@
     Merker (Closes: #774067)
   * [xen] More netback fixes (including reintroducing support for
     feature-rx-notify, which was regressed by the fix to #767261).
+  * Disable TSO in mv643xx_eth driver by default again, since previous fix
+    appears to not work on all platforms (Closes: #764162).
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 13 Dec 2014 11:45:48 +0000
 

Added: dists/sid/linux/debian/patches/bugfix/all/net-mv643xx-disable-tso-by-default.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/all/net-mv643xx-disable-tso-by-default.patch	Mon Jan 12 14:27:33 2015	(r22254)
@@ -0,0 +1,53 @@
+From patchwork Sat Nov  1 15:30:20 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [1/1] net: mv643xx_eth: Make TSO disabled by default
+From: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
+X-Patchwork-Id: 405792
+Message-Id: <1414855820-15094-2-git-send-email-ezequiel.garcia at free-electrons.com>
+To: <netdev at vger.kernel.org>, David Miller <davem at davemloft.net>
+Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>,
+ Gregory Clement <gregory.clement at free-electrons.com>,
+ Tawfik Bayouk <tawfik at marvell.com>, Lior Amsalem <alior at marvell.com>,
+ Nadav Haklai <nadavh at marvell.com>,
+ Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
+Date: Sat,  1 Nov 2014 12:30:20 -0300
+
+Data corruption has been observed to be produced by TSO. For instance,
+accessing files on a NFS-server with TSO enabled results in different data
+transferred each time.
+
+This has been observed only on Kirkwood platforms, i.e. with the mv643xx_eth
+driver. Same tests on platforms using the mvneta ethernet driver have
+passed without errors.
+
+Make TSO disabled by default for now, until we can found a proper fix
+for the regression.
+
+Fixes: 3ae8f4e0b98 ('net: mv643xx_eth: Implement software TSO')
+Reported-by: Slawomir Gajzner <slawomir.gajzner at gmail.com>
+Reported-by: Julien D'Ascenzio <jdascenzio at yahoo.fr>
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
+---
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
+index b151a94..8b72780 100644
+--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
++++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
+@@ -3110,11 +3110,11 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
+ 	dev->watchdog_timeo = 2 * HZ;
+ 	dev->base_addr = 0;
+ 
+-	dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
++	dev->features = NETIF_F_SG | NETIF_F_IP_CSUM;
+ 	dev->vlan_features = dev->features;
+ 
+ 	dev->features |= NETIF_F_RXCSUM;
+-	dev->hw_features = dev->features;
++	dev->hw_features = dev->features  | NETIF_F_TSO;
+ 
+ 	dev->priv_flags |= IFF_UNICAST_FLT;
+ 	dev->gso_max_segs = MV643XX_MAX_TSO_SEGS;

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Mon Jan 12 05:49:17 2015	(r22253)
+++ dists/sid/linux/debian/patches/series	Mon Jan 12 14:27:33 2015	(r22254)
@@ -163,6 +163,7 @@
 bugfix/all/move-d_rcu-from-overlapping-d_child-to-overlapping-d.patch
 bugfix/all/aufs-move-d_rcu-from-overlapping-d_child-to-overlapping-d.patch
 bugfix/all/deal-with-deadlock-in-d_walk.patch
+bugfix/all/net-mv643xx-disable-tso-by-default.patch
 
 # memfd_create() & kdbus backport
 features/all/kdbus/mm-allow-drivers-to-prevent-new-writable-mappings.patch