rpms/kernel/devel linux-2.6-defaults-aspm.patch, NONE, 1.1 config-generic, 1.305, 1.306 kernel.spec, 1.1632, 1.1633

[Matthew Garrett]

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8785

Modified Files:
	config-generic kernel.spec 
Added Files:
	linux-2.6-defaults-aspm.patch 
Log Message:
* Thu Jul 16 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6-defaults-aspm.patch - default ASPM to on for PCIe >= 1.1 hardware


linux-2.6-defaults-aspm.patch:

--- NEW FILE linux-2.6-defaults-aspm.patch ---
diff -up linux-2.6.30.noarch/drivers/pci/pcie/aspm.c.mjg linux-2.6.30.noarch/drivers/pci/pcie/aspm.c
--- linux-2.6.30.noarch/drivers/pci/pcie/aspm.c.mjg	2009-07-16 22:01:11.000000000 +0100
+++ linux-2.6.30.noarch/drivers/pci/pcie/aspm.c	2009-07-16 22:01:30.000000000 +0100
@@ -65,7 +65,7 @@ static LIST_HEAD(link_list);
 #define POLICY_DEFAULT 0	/* BIOS default setting */
 #define POLICY_PERFORMANCE 1	/* high performance */
 #define POLICY_POWERSAVE 2	/* high power saving */
-static int aspm_policy;
+static int aspm_policy = POLICY_POWERSAVE;
 static const char *policy_str[] = {
 	[POLICY_DEFAULT] = "default",
 	[POLICY_PERFORMANCE] = "performance",


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -p -r1.305 -r1.306
--- config-generic	16 Jul 2009 05:32:36 -0000	1.305
+++ config-generic	16 Jul 2009 21:24:36 -0000	1.306
@@ -2778,6 +2778,7 @@ CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_IDMOUSE=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1632
retrieving revision 1.1633
diff -u -p -r1.1632 -r1.1633
--- kernel.spec	16 Jul 2009 05:32:39 -0000	1.1632
+++ kernel.spec	16 Jul 2009 21:24:36 -0000	1.1633
@@ -621,6 +621,7 @@ Patch360: linux-2.6-debug-always-inline-
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch381: linux-2.6-pciehp-update.patch
 Patch382: linux-2.6-defaults-pciehp.patch
+Patch383: linux-2.6-defaults-aspm.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -1168,6 +1169,8 @@ ApplyPatch linux-2.6-defaults-pci_no_msi
 #ApplyPatch linux-2.6-pciehp-update.patch
 # default to enabling passively listening for hotplug events
 #ApplyPatch linux-2.6-defaults-pciehp.patch
+# enable ASPM by default on hardware we expect to work
+ApplyPatch linux-2.6-defaults-aspm.patch
 
 #
 # SCSI Bits.
@@ -1872,6 +1875,9 @@ fi
 # and build.
 
 %changelog
+* Thu Jul 16 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-defaults-aspm.patch - default ASPM to on for PCIe >= 1.1 hardware
+
 * Thu Jul 16 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.69.rc3
 - linux-2.6-vga-arb.patch - add VGA arbiter.
 - drm-vga-arb.patch - add VGA arbiter support to drm