[kernel] r19349 - in dists/squeeze/linux-2.6/debian: . patches/features/all/sky2 patches/series

[Ben Hutchings]

Author: benh
Date: Tue Aug 21 03:30:16 2012
New Revision: 19349

Log:
sky2: Add 'legacy_pme' option for PCI legacy power management (Closes: #647560)

Added:
   dists/squeeze/linux-2.6/debian/patches/features/all/sky2/0057-sky2-override-for-PCI-legacy-power-management.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/46

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Mon Aug 20 13:22:34 2012	(r19348)
+++ dists/squeeze/linux-2.6/debian/changelog	Tue Aug 21 03:30:16 2012	(r19349)
@@ -26,6 +26,8 @@
   [ Jonathan Nieder ]
   * ath5k: initialize default noise floor
   * ath5k: use noise calibration from madwifi hal (Closes: #611107)
+  * sky2: Add 'legacy_pme' option for PCI legacy power management
+    (Closes: #647560; works around regression introduced in 2.6.32-22)
 
  -- Bastian Blank <waldi at debian.org>  Mon, 07 May 2012 19:18:05 +0200
 

Added: dists/squeeze/linux-2.6/debian/patches/features/all/sky2/0057-sky2-override-for-PCI-legacy-power-management.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/sky2/0057-sky2-override-for-PCI-legacy-power-management.patch	Tue Aug 21 03:30:16 2012	(r19349)
@@ -0,0 +1,52 @@
+From: stephen hemminger <shemminger at vyatta.com>
+Date: Wed, 21 Mar 2012 05:32:05 +0000
+Subject: sky2: override for PCI legacy power management
+
+[ Upstream commit 5676cc7bfe1e388e87843f71daa229610385b41e ]
+
+Some BIOS's don't setup power management correctly (what else is
+new) and don't allow use of PCI Express power control. Add a special
+exception module parameter to allow working around this issue.
+Based on slightly different patch by Knut Petersen.
+
+Reported-by: Arkadiusz Miskiewicz <arekm at maven.pl>
+Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
+---
+ drivers/net/sky2.c |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
+index 9c7a89fba483..c4f82be9af89 100644
+--- a/drivers/net/sky2.c
++++ b/drivers/net/sky2.c
+@@ -96,6 +96,10 @@ static int disable_msi = 0;
+ module_param(disable_msi, int, 0);
+ MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
+ 
++static int legacy_pme = 0;
++module_param(legacy_pme, int, 0);
++MODULE_PARM_DESC(legacy_pme, "Legacy power management");
++
+ static DEFINE_PCI_DEVICE_TABLE(sky2_id_table) = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */
+@@ -796,6 +800,13 @@ static void sky2_wol_init(struct sky2_port *sky2)
+ 	/* Disable PiG firmware */
+ 	sky2_write16(hw, B0_CTST, Y2_HW_WOL_OFF);
+ 
++	/* Needed by some broken BIOSes, use PCI rather than PCI-e for WOL */
++	if (legacy_pme) {
++		u32 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);
+ }
+-- 
+1.7.10.1
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/46
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/46	Mon Aug 20 13:22:34 2012	(r19348)
+++ dists/squeeze/linux-2.6/debian/patches/series/46	Tue Aug 21 03:30:16 2012	(r19349)
@@ -18,3 +18,4 @@
 + bugfix/x86/drm-i915-Fix-TV-Out-refresh-rate.patch
 + bugfix/x86/drm-i915-no-lvds-quirk-for-AOpen-MP45.patch
 + bugfix/all/drm-radeon-kms-fix-MSI-re-arm-on-rv370.patch
++ features/all/sky2/0057-sky2-override-for-PCI-legacy-power-management.patch