packages (LINUX_2_6_35): kernel/kernel-small_fixes.patch - revert 87b09f1f2...

[arekm]

Author: arekm                        Date: Sun Oct 24 15:52:58 2010 GMT
Module: packages                      Tag: LINUX_2_6_35
---- Log message:
- revert 87b09f1f25cd1e01d7c50bf423c7fe33027d7511; makes my sky2 resume nicely on WOL

---- Files affected:
packages/kernel:
   kernel-small_fixes.patch (1.11 -> 1.11.2.1) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.11 packages/kernel/kernel-small_fixes.patch:1.11.2.1
--- packages/kernel/kernel-small_fixes.patch:1.11	Wed Oct 20 21:07:36 2010
+++ packages/kernel/kernel-small_fixes.patch	Sun Oct 24 17:52:53 2010
@@ -78,3 +78,41 @@
  
  /* Some toolchains use a `_' prefix for all user symbols. */
 
+commit 87b09f1f25cd1e01d7c50bf423c7fe33027d7511
+Author: stephen hemminger <shemminger at vyatta.com>
+Date:   Fri Feb 12 06:58:00 2010 +0000
+
+    sky2: dont enable PME legacy mode
+    
+    This bit is not changed by vendor driver, and should be left alone.
+    The documentation implies this a debug bit.
+      0 = WAKE# only asserted when VMAIN not available
+      1 = WAKE# is depend on wake events and independent of VMAIN.
+    
+    Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git b/drivers/net/sky2.c a/drivers/net/sky2.c
+index 2494842..edf37aa 100644
+--- b/drivers/net/sky2.c
++++ a/drivers/net/sky2.c
+@@ -733,6 +733,7 @@ static void sky2_wol_init(struct sky2_port *sky2)
+ 	unsigned port = sky2->port;
+ 	enum flow_control save_mode;
+ 	u16 ctrl;
++	u32 reg1;
+ 
+ 	/* Bring hardware out of reset */
+ 	sky2_write16(hw, B0_CTST, CS_RST_CLR);
+@@ -786,6 +787,11 @@ static void sky2_wol_init(struct sky2_port *sky2)
+ 	/* Disable PiG firmware */
+ 	sky2_write16(hw, B0_CTST, Y2_HW_WOL_OFF);
+ 
++	/* Turn on legacy PCI-Express PME mode */
++	reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
++	reg1 |= PCI_Y2_PME_LEGACY;
++	sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
++
+ 	/* block receiver */
+ 	sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
+ }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.11&r2=1.11.2.1&f=u