[kernel] r7587 - in dists/trunk/linux-2.6/debian: . patches/bugfix patches/series

[Dann Frazier]

Author: dannf
Date: Mon Oct  9 17:10:59 2006
New Revision: 7587

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/sky2-receive-FIFO-fix.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/3

Log:
* bugfix/sky2-receive-FIFO-fix.patch: fix sky2 hangs on some chips
  Thanks to Stephen Hemminger for the patch. (Closes: #391382) -- compile tested

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Oct  9 17:10:59 2006
@@ -23,7 +23,11 @@
     - Cobalt: Time runs too quickly
     - Show actual CPU information in /proc/cpuinfo
 
- -- maximilian attems <maks at sternwelten.at>  Thu,  5 Oct 2006 17:10:46 +0200
+  [ dann frazier ]
+  * bugfix/sky2-receive-FIFO-fix.patch: fix sky2 hangs on some chips
+    Thanks to Stephen Hemminger for the patch. (Closes: #391382)
+
+ -- dann frazier <dannf at debian.org>  Mon,  9 Oct 2006 10:59:58 -0600
 
 linux-2.6 (2.6.18-2) unstable; urgency=low
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/sky2-receive-FIFO-fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/sky2-receive-FIFO-fix.patch	Mon Oct  9 17:10:59 2006
@@ -0,0 +1,71 @@
+From shemminger at osdl.org Fri Oct 06 17:10:48 2006
+Received: (at 391382) by bugs.debian.org; 7 Oct 2006 00:10:48 +0000
+Return-path: <shemminger at osdl.org>
+Received: from smtp.osdl.org ([65.172.181.4])
+	by spohr.debian.org with esmtp (Exim 4.50)
+	id 1GVzmC-0008SO-GB
+	for 391382 at bugs.debian.org; Fri, 06 Oct 2006 17:10:48 -0700
+Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6])
+	by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id k970AiaX032159
+	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO);
+	Fri, 6 Oct 2006 17:10:45 -0700
+Received: from freekitty (freekitty.pdx.osdl.net [10.8.0.54])
+	by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id k970Ae2c018518;
+	Fri, 6 Oct 2006 17:10:40 -0700
+Date: Fri, 6 Oct 2006 16:09:12 -0700
+From: Stephen Hemminger <shemminger at osdl.org>
+To: Oleg Verych <olecom at flower.upol.cz>
+Cc: Matthias Kreis <Matthias.Kreis at remasec.ch>, 391382 at bugs.debian.org
+Subject: Re: sky2 stops working 2.6.17 or ethernet driver crashes 2.6.18
+Message-ID: <20061006160912.1d576012 at freekitty>
+In-Reply-To: <slrneicn33.43t.olecom at deen.upol.cz.local>
+References: <20061006110110.10879.23251.reportbug at rincewind.remasec.local>
+	<slrneicn33.43t.olecom at deen.upol.cz.local>
+Organization: OSDL
+X-Mailer: Sylpheed-Claws 2.5.0-rc3 (GTK+ 2.10.6; i486-pc-linux-gnu)
+Mime-Version: 1.0
+Content-Type: text/plain; charset=US-ASCII
+Content-Transfer-Encoding: 7bit
+X-MIMEDefang-Filter: osdl$Revision: 1.155 $
+X-Scanned-By: MIMEDefang 2.36
+X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
+	(1.212-2003-09-23-exp) on spohr.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, hits=-1.4 required=4.0 tests=BAYES_00,UPPERCASE_25_50 
+	autolearn=no version=2.60-bugs.debian.org_2005_01_02
+
+Does this help.. it is going in next patchset.
+--------------------------------------------------------
+
+Subject: sky2: fix hangs on some chips
+
+The driver inherited some bad setup code from sk98lin (vendor) driver that
+causes receive FIFO probelms.  Just remove it.
+
+Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
+
+--- sky2.orig/drivers/net/sky2.c	2006-10-06 15:53:52.000000000 -0700
++++ sky2/drivers/net/sky2.c	2006-10-06 15:57:47.000000000 -0700
+@@ -689,15 +689,10 @@
+ 	sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR);
+ 	sky2_write16(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON);
+ 
+-	if (hw->chip_id == CHIP_ID_YUKON_EC_U) {
+-		sky2_write8(hw, SK_REG(port, RX_GMF_LP_THR), 768/8);
+-		sky2_write8(hw, SK_REG(port, RX_GMF_UP_THR), 1024/8);
+-		if (hw->dev[port]->mtu > ETH_DATA_LEN) {
+-			/* set Tx GMAC FIFO Almost Empty Threshold */
+-			sky2_write32(hw, SK_REG(port, TX_GMF_AE_THR), 0x180);
+-			/* Disable Store & Forward mode for TX */
+-			sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T), TX_STFW_DIS);
+-		}
++	if (hw->chip_id == CHIP_ID_YUKON_EC_U
++	    && hw->dev[port]->mtu > ETH_DATA_LEN) {
++		/* Disable Store & Forward mode for TX */
++		sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T), TX_STFW_DIS);
+ 	}
+ 
+ }
+
+
+

Modified: dists/trunk/linux-2.6/debian/patches/series/3
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/3	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/3	Mon Oct  9 17:10:59 2006
@@ -4,3 +4,4 @@
 + bugfix/mips/sb1480_interrupt_fixes.patch
 + bugfix/mips/cobalt_hz.patch
 + bugfix/mips/real-cpu-cpuinfo.patch
++ bugfix/sky2-receive-FIFO-fix.patch