[kernel] r16488 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Mon Oct 25 03:57:31 2010
New Revision: 16488

Log:
e1000e: Reset 82577/82578 PHY before first PHY register read
(Closes: #601017)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/e1000e-Reset-82577+82578-PHY-before-first-PHY-register-read.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/27

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Oct 25 02:21:37 2010	(r16487)
+++ dists/sid/linux-2.6/debian/changelog	Mon Oct 25 03:57:31 2010	(r16488)
@@ -19,6 +19,10 @@
   * xen: import additional fixes for disabling netfront smartpoll mode
     (Closes: #600992).
 
+  [ dann frazier ]
+  * e1000e: Reset 82577/82578 PHY before first PHY register read
+    (Closes: #601017)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 19 Oct 2010 23:27:23 +0100
 
 linux-2.6 (2.6.32-26) unstable; urgency=high

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/e1000e-Reset-82577+82578-PHY-before-first-PHY-register-read.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/e1000e-Reset-82577+82578-PHY-before-first-PHY-register-read.patch	Mon Oct 25 03:57:31 2010	(r16488)
@@ -0,0 +1,44 @@
+[Backported to Debian's 2.6.32 by dann frazier <dannf at debian.org>]
+
+commit 627c8a041f7aaaea93c766f69bd61d952a277586
+Author: Bruce Allan <bruce.w.allan at intel.com>
+Date:   Wed May 5 22:00:27 2010 +0000
+
+    e1000e: Reset 82577/82578 PHY before first PHY register read
+    
+    Reset the PHY before first accessing it.  Doing so, ensure that the PHY is
+    in a known good state before we read/write PHY registers. This fixes a
+    driver probe failure.
+    
+    Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
+    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff -urpN a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
+--- a/drivers/net/e1000e/ich8lan.c	2010-10-24 21:47:49.589464336 -0600
++++ b/drivers/net/e1000e/ich8lan.c	2010-10-24 21:55:11.890982870 -0600
+@@ -274,6 +274,16 @@ static s32 e1000_init_phy_params_pchlan(
+ 	phy->ops.write_phy_reg_locked = e1000_write_phy_reg_hv_locked;
+ 	phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
+ 
++	/*
++	 * Reset the PHY before any acccess to it.  Doing so, ensures that
++	 * the PHY is in a known good state before we read/write PHY registers.
++	 * The generic reset is sufficient here, because we haven't determined
++	 * the PHY type yet.
++	 */
++	ret_val = e1000e_phy_hw_reset_generic(hw);
++	if (ret_val)
++		goto out;
++
+ 	phy->id = e1000_phy_unknown;
+ 	e1000e_get_phy_id(hw);
+ 	phy->type = e1000e_get_phy_type_from_id(phy->id);
+@@ -287,6 +297,7 @@ static s32 e1000_init_phy_params_pchlan(
+ 		phy->ops.commit_phy = e1000e_phy_sw_reset;
+ 	}
+ 
++ out:
+ 	return ret_val;
+ }
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/27
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/27	Mon Oct 25 02:21:37 2010	(r16487)
+++ dists/sid/linux-2.6/debian/patches/series/27	Mon Oct 25 03:57:31 2010	(r16488)
@@ -9,3 +9,4 @@
 - bugfix/all/phonet-disable-network-namespace-support.patch
 + bugfix/all/stable/2.6.32.25-rc1.patch
 + features/all/btrfs-add-a-df-ioctl-for-btrfs.patch
++ bugfix/all/e1000e-Reset-82577+82578-PHY-before-first-PHY-register-read.patch