[gentoo-commits] linux-patches r1675 - genpatches-2.6/trunk/2.6.32

[gentoo-commits] linux-patches r1675 - genpatches-2.6/trunk/2.6.32

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2010-02-18 23:03:50 +0000 (Thu, 18 Feb 2010)
New Revision: 1675

Added:
   genpatches-2.6/trunk/2.6.32/2400_5906-transmit-hang-fix.patch
Modified:
   genpatches-2.6/trunk/2.6.32/0000_README
Log:
Fix tranmits hangs in Broadcom 5906 adapter. And don't break the other broadcom adapters.

Modified: genpatches-2.6/trunk/2.6.32/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.32/0000_README	2010-02-18 15:58:13 UTC (rev 1674)
+++ genpatches-2.6/trunk/2.6.32/0000_README	2010-02-18 23:03:50 UTC (rev 1675)
@@ -71,6 +71,10 @@
 From:   http://www.kernel.org
 Desc:   Linux 2.6.32.8
 
+Patch:  2400_5906-transmit-hang-fix.patch
+From:   http://bugs.gentoo.org/show_bug.cgi?id=304625
+Desc:	tg3: Fix 5906 transmit hangs
+
 Patch:  2410_rtl8187se-compilation-fix.patch
 From:   http://bugs.gentoo.org/show_bug.cgi?id=296920
 Desc:	Fix rtl8187se compilation errors with mac80211

Added: genpatches-2.6/trunk/2.6.32/2400_5906-transmit-hang-fix.patch
===================================================================
--- genpatches-2.6/trunk/2.6.32/2400_5906-transmit-hang-fix.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.32/2400_5906-transmit-hang-fix.patch	2010-02-18 23:03:50 UTC (rev 1675)
@@ -0,0 +1,84 @@
+This is a resubmit backport of commit 92c6b8d16a36df3f28b2537bed2a56491fb08f11 to kernel version 2.6.32. The gentoo bug report can be found at https://bugs.gentoo.org/show_bug.cgi?id=301091. Thanks to Matt Carlson for his assistance and working me to fix a regression caused by the intial patch.  The original description is as follows:
+
+The 5906 has trouble with fragments that are less than 8 bytes in size.
+This patch works around the problem by pivoting the 5906's transmit routine to tg3_start_xmit_dma_bug() and introducing a new SHORT_DMA_BUG flag that enables code to detect and react to the problematic condition.
+
+Signed-off-by: Mike Pagano <mpagano@gentoo.org>
+---
+--- a/drivers/net/tg3.c	2010-01-30 15:59:44.000000000 -0500
++++ b/drivers/net/tg3.c	2010-02-13 10:16:16.000000000 -0500
+@@ -5392,7 +5392,7 @@ static netdev_tx_t tg3_start_xmit_dma_bu
+ 	mss = 0;
+ 	if ((mss = skb_shinfo(skb)->gso_size) != 0) {
+ 		struct iphdr *iph;
+-		int tcp_opt_len, ip_tcp_len, hdr_len;
++		u32 tcp_opt_len, ip_tcp_len, hdr_len;
+ 
+ 		if (skb_header_cloned(skb) &&
+ 		    pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
+@@ -5423,8 +5423,10 @@ static netdev_tx_t tg3_start_xmit_dma_bu
+ 								 IPPROTO_TCP,
+ 								 0);
+ 
+-		if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO) ||
+-		    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)) {
++		if (tp->tg3_flags2 & TG3_FLG2_HW_TSO_2)
++			mss |= hdr_len << 9;
++		else if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_1) ||
++			GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
+ 			if (tcp_opt_len || iph->ihl > 5) {
+ 				int tsflags;
+ 
+@@ -5459,6 +5461,9 @@ static netdev_tx_t tg3_start_xmit_dma_bu
+ 
+ 	would_hit_hwbug = 0;
+ 
++	if ((tp->tg3_flags3 & TG3_FLG3_SHORT_DMA_BUG) && len <= 8)
++		would_hit_hwbug = 1;
++
+ 	if (tp->tg3_flags3 & TG3_FLG3_5701_DMA_BUG)
+ 		would_hit_hwbug = 1;
+ 	else if (tg3_4g_overflow_test(mapping, len))
+@@ -5482,6 +5487,10 @@ static netdev_tx_t tg3_start_xmit_dma_bu
+ 
+ 			tnapi->tx_buffers[entry].skb = NULL;
+ 
++			if ((tp->tg3_flags3 & TG3_FLG3_SHORT_DMA_BUG) &&
++				len <= 8)
++					would_hit_hwbug = 1;
++
+ 			if (tg3_4g_overflow_test(mapping, len))
+ 				would_hit_hwbug = 1;
+ 
+@@ -12608,6 +12617,13 @@ static int __devinit tg3_get_invariants(
+ 		}
+ 	}
+ 
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
++		tp->tg3_flags3 |= TG3_FLG3_SHORT_DMA_BUG;
++
+ 	tp->irq_max = 1;
+ 
+ #ifdef TG3_NAPI
+@@ -13975,8 +13991,7 @@ static int __devinit tg3_init_one(struct
+ 		goto err_out_iounmap;
+ 	}
+ 
+-	if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
+-	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
++	if (tp->tg3_flags3 & TG3_FLG3_5755_PLUS)
+ 		dev->netdev_ops = &tg3_netdev_ops;
+ 	else
+ 		dev->netdev_ops = &tg3_netdev_ops_dma_bug;
+--- a/drivers/net/tg3.h	2010-01-30 15:59:47.000000000 -0500
++++ b/drivers/net/tg3.h	2010-01-31 14:02:59.000000000 -0500
+@@ -2759,6 +2759,9 @@ struct tg3 {
+ #define TG3_FLG3_TOGGLE_10_100_L1PLLPD	0x00008000
+ #define TG3_FLG3_PHY_IS_FET		0x00010000
+ #define TG3_FLG3_ENABLE_RSS		0x00020000
++#define TG3_FLG3_4G_DMA_BNDRY_BUG      0x00080000
++#define TG3_FLG3_40BIT_DMA_LIMIT_BUG   0x00100000
++#define TG3_FLG3_SHORT_DMA_BUG  0x00200000
+ 
+ 	struct timer_list		timer;
+ 	u16				timer_counter;