rpms/kernel/FC-5 linux-2.6-net-e1000-suspend.patch, NONE, 1.1 kernel-2.6.spec, 1.2233, 1.2234

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26752

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-net-e1000-suspend.patch 
Log Message:
E1000 suspend/resume fixes.

linux-2.6-net-e1000-suspend.patch:
 e1000_main.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE linux-2.6-net-e1000-suspend.patch ---

e1000: Fix suspend/resume powerup and irq allocation

From: Auke Kok <auke-jan.h.kok at intel.com>

After 7.0.33/2.6.16, e1000 suspend/resume left the user with an enabled
device showing garbled statistics and undetermined irq allocation state,
where `ifconfig eth0 down` would display `trying to free already freed irq`.

Explicitly free and allocate irq as well as powerup the PHY during resume
fixes when needed.

Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
---

 drivers/net/e1000/e1000_main.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 8d04752..726ec5e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4800,6 +4800,9 @@ e1000_suspend(struct pci_dev *pdev, pm_m
 	if (adapter->hw.phy_type == e1000_phy_igp_3)
 		e1000_phy_powerdown_workaround(&adapter->hw);
 
+	if (netif_running(netdev))
+		e1000_free_irq(adapter);
+
 	/* Release control of h/w to f/w.  If f/w is AMT enabled, this
 	 * would have already happened in close and is redundant. */
 	e1000_release_hw_control(adapter);
@@ -4830,6 +4833,10 @@ e1000_resume(struct pci_dev *pdev)
 	pci_enable_wake(pdev, PCI_D3hot, 0);
 	pci_enable_wake(pdev, PCI_D3cold, 0);
 
+	if (netif_running(netdev) && (err = e1000_request_irq(adapter)))
+		return err;
+
+	e1000_power_up_phy(adapter);
 	e1000_reset(adapter);
 	E1000_WRITE_REG(&adapter->hw, WUS, ~0);
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2233
retrieving revision 1.2234
diff -u -r1.2233 -r1.2234
--- kernel-2.6.spec	9 Nov 2006 23:45:55 -0000	1.2233
+++ kernel-2.6.spec	9 Nov 2006 23:48:34 -0000	1.2234
@@ -448,6 +448,7 @@
 # Net driver fixes.
 Patch2500: linux-2.6-net-forcedeth-suspend.patch
 Patch2501: linux-2.6-net-netpoll-fixes.patch
+Patch2502: linux-2.6-net-e1000-suspend.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -1041,6 +1042,9 @@
 %patch2500 -p1
 # Netpoll fixes.
 %patch2501 -p1
+# E1000 suspend fixes
+%patch2502 -p1
+
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
@@ -1652,6 +1656,7 @@
 - Fix potential NULL dereference in sys_move_pages
 - ISO9660 __find_get_block_slow() denial of service CVE-2006-5757
 - Fix up oops in cramfs when encountering corrupt images.
+- E1000 suspend/resume fixes.
 
 * Mon Nov  6 2006 Roland McGrath <roland at redhat.com>
 - New utrace patch: fix locking snafu crash on second engine attach.