public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org, davem@davemloft.net
Cc: Justin Forbes <jmforbes@linuxtx.org>,
	Zwane Mwaikambo <zwane@arm.linux.org.uk>,
	"Theodore Ts'o" <tytso@mit.edu>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Dave Jones <davej@redhat.com>,
	Chuck Wolber <chuckw@quantumlinux.com>,
	Chris Wedgwood <reviews@ml.cw.f00f.org>,
	torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
	Michael Chan <mchan@broadcom.com>,
	Greg Kroah-Hartman <gregkh@suse.de>
Subject: [patch 17/37] TG3: Disable TSO by default
Date: Wed, 6 Sep 2006 15:56:44 -0700	[thread overview]
Message-ID: <20060906225644.GR15922@kroah.com> (raw)
In-Reply-To: <20060906225444.GA15922@kroah.com>

[-- Attachment #1: tg3-disable-tso-by-default.patch --]
[-- Type: text/plain, Size: 2247 bytes --]

-stable review patch.  If anyone has any objections, please let us know.

------------------

From: Michael Chan <mchan@broadcom.com>

Disable TSO by default on some chips due to hardware errata.

Enabling TSO can lead to tx timeouts in some cases when the TSO
header size exceeds 80 bytes on the affected chips.  This limit
can be exceeded when the TCP header contains the timestamp option
plus 2 SACK blocks, for example.  A more complete workaround is
available in the next 2.6.18 kernel.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>


---
 drivers/net/tg3.c |   12 ++++++++----
 drivers/net/tg3.h |    1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

--- linux-2.6.17.11.orig/drivers/net/tg3.c
+++ linux-2.6.17.11/drivers/net/tg3.c
@@ -69,8 +69,8 @@
 
 #define DRV_MODULE_NAME		"tg3"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"3.59"
-#define DRV_MODULE_RELDATE	"June 8, 2006"
+#define DRV_MODULE_VERSION	"3.59.1"
+#define DRV_MODULE_RELDATE	"August 25, 2006"
 
 #define TG3_DEF_MAC_MODE	0
 #define TG3_DEF_RX_MODE		0
@@ -11381,11 +11381,15 @@ static int __devinit tg3_init_one(struct
 		tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE;
 	}
 
-	/* TSO is on by default on chips that support hardware TSO.
+	/* TSO is on by default on chips that support HW_TSO_2.
+	 * Some HW_TSO_1 capable chips have bugs that can lead to
+	 * tx timeouts in some cases when TSO is enabled.
 	 * Firmware TSO on older chips gives lower performance, so it
 	 * is off by default, but can be enabled using ethtool.
 	 */
-	if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
+	if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_2) ||
+	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 &&
+	     tp->pci_chip_rev_id >= CHIPREV_ID_5750_C2))
 		dev->features |= NETIF_F_TSO;
 
 #endif
--- linux-2.6.17.11.orig/drivers/net/tg3.h
+++ linux-2.6.17.11/drivers/net/tg3.h
@@ -125,6 +125,7 @@
 #define  CHIPREV_ID_5750_A0		 0x4000
 #define  CHIPREV_ID_5750_A1		 0x4001
 #define  CHIPREV_ID_5750_A3		 0x4003
+#define  CHIPREV_ID_5750_C2		 0x4202
 #define  CHIPREV_ID_5752_A0_HW		 0x5000
 #define  CHIPREV_ID_5752_A0		 0x6000
 #define  CHIPREV_ID_5752_A1		 0x6001

--

  parent reply	other threads:[~2006-09-06 23:11 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20060906224631.999046890@quad.kroah.org>
2006-09-06 22:54 ` [patch 00/37] -stable review Greg KH
2006-09-06 22:54   ` [patch 01/37] TEXTSEARCH: Fix Boyer Moore initialization bug Greg KH
2006-09-06 22:55   ` [patch 02/37] spectrum_cs: Fix firmware uploading errors Greg KH
2006-09-06 22:55   ` [patch 03/37] Fix output framentation of paged-skbs Greg KH
2006-09-06 22:55   ` [patch 04/37] fix compilation error on IA64 Greg KH
2006-09-07  8:45     ` Kirill Korotaev
2006-09-06 22:55   ` [patch 05/37] bridge-netfilter: dont overwrite memory outside of skb Greg KH
2006-09-06 22:55   ` [patch 06/37] Allow per-route window scale limiting Greg KH
2006-09-06 22:55   ` [patch 07/37] Have ext2 reject file handles with bad inode numbers early Greg KH
2006-09-06 22:55   ` [patch 08/37] dm snapshot: unify chunk_size Greg KH
2006-09-06 22:55   ` [patch 09/37] dm: fix idr minor allocation Greg KH
2006-09-06 22:55   ` [patch 10/37] dm: move idr_pre_get Greg KH
2006-09-06 22:55   ` [patch 11/37] dm: change minor_lock to spinlock Greg KH
2006-09-06 22:55   ` [patch 12/37] dm: add DMF_FREEING Greg KH
2006-09-06 22:56   ` [patch 13/37] dm: fix mapped device ref counting Greg KH
2006-09-06 22:56   ` [patch 14/37] dm: add module " Greg KH
2006-09-06 22:56   ` [patch 15/37] dm: fix block device initialisation Greg KH
2006-09-06 22:56   ` [patch 16/37] dm: mirror sector offset fix Greg KH
2006-09-06 22:56   ` Greg KH [this message]
2006-09-06 22:56   ` [patch 18/37] SPARC64: Fix X server crashes on sparc64 Greg KH
2006-09-06 22:56   ` [patch 19/37] SCTP: Fix sctp_primitive_ABORT() call in sctp_close() Greg KH
2006-09-06 22:56   ` [patch 20/37] IPV6 OOPSer triggerable by any user Greg KH
2006-09-06 22:56   ` [patch 21/37] fcntl(F_SETSIG) fix Greg KH
2006-09-06 22:57   ` [patch 22/37] bug in futex unqueue_me Greg KH
2006-09-06 22:57   ` [patch 23/37] binfmt_elf: fix checks for bad address Greg KH
2006-09-06 22:57   ` [patch 24/37] uhci-hcd: fix list access bug Greg KH
2006-09-06 22:57   ` [patch 25/37] Silent data corruption caused by XPC Greg KH
2006-09-06 22:57   ` [patch 26/37] PKTGEN: Make sure skb->{nh,h} are initialized in fill_packet_ipv6() too Greg KH
2006-09-06 22:57   ` [patch 27/37] PKTGEN: Fix oops when used with balance-tlb bonding Greg KH
2006-09-06 22:57   ` [patch 28/37] Missing PCI id update for VIA IDE Greg KH
2006-09-06 23:33     ` [-stable patch] pci_ids.h: add some VIA IDE identifiers Adrian Bunk
2006-09-06 22:57   ` [patch 29/37] dvb-core: Proper handling ULE SNDU length of 0 Greg KH
2006-09-07 12:57     ` Marcel Holtmann
2006-09-07 15:39       ` [stable] " Greg KH
2006-09-08 11:31         ` Marcel Holtmann
2006-09-08 12:58     ` Michael Krufky
2006-09-08 13:11       ` Ang Way Chuang
2006-09-08 17:29       ` Greg KH
2006-09-15 16:11         ` Michael Krufky
2006-09-15 16:15           ` Marcel Siegert
2006-09-15 16:36           ` Marcel Holtmann
2006-09-15 18:07             ` Michael Krufky
2006-09-15 18:18               ` Marcel Holtmann
2006-09-20  9:38                 ` Ang Way Chuang
2006-09-06 22:57   ` [patch 30/37] Remove redundant up() in stop_machine() Greg KH
2006-09-06 22:57   ` [patch 31/37] dm: Fix deadlock under high i/o load in raid1 setup Greg KH
2006-09-06 22:57   ` [patch 32/37] sky2: accept flow control Greg KH
2006-09-06 22:57   ` [patch 33/37] sky2: clear status IRQ after empty Greg KH
2006-09-06 22:57   ` [patch 34/37] sky2: use dev_alloc_skb for receive buffers Greg KH
2006-09-06 22:58   ` [patch 35/37] sky2: MSI test timing Greg KH
2006-09-06 22:58   ` [patch 36/37] sky2: fix fiber support Greg KH
2006-09-06 22:58   ` [patch 37/37] sky2: version 1.6.1 Greg KH
2006-09-07 19:25     ` Pavel Machek
2006-09-07 20:34       ` Greg KH
2006-09-07 21:03         ` Pavel Machek
2006-09-07 21:50           ` Stephen Hemminger
2006-09-06 23:33   ` [patch 00/37] -stable review Adrian Bunk
2006-09-07  2:08     ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060906225644.GR15922@kroah.com \
    --to=gregkh@suse.de \
    --cc=akpm@osdl.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=chuckw@quantumlinux.com \
    --cc=davej@redhat.com \
    --cc=davem@davemloft.net \
    --cc=jmforbes@linuxtx.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mchan@broadcom.com \
    --cc=rdunlap@xenotime.net \
    --cc=reviews@ml.cw.f00f.org \
    --cc=stable@kernel.org \
    --cc=torvalds@osdl.org \
    --cc=tytso@mit.edu \
    --cc=zwane@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox