use BIOS default settings for ASPM

RHEL sets this to yes, but serveral user reported problems with that.
So we use the same settings as the official linux kernel instead.

diff --git a/Makefile b/Makefile
index 1ec489e902dd048e2e3c5bf8ec93ce162aed73f4..77c0a10ffcc53a18439a4c2c687d97df0eecc4fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cd ${KERNEL_SRC}; patch -p1 <../dlm-delayed-reply-message-warning.patch
        cd ${KERNEL_SRC}; patch -p1 <../dlm-remove-shared-message-stub-for-recovery.patch
        cd ${KERNEL_SRC}; patch -p1 <../dlm-make-plock-operation-killable.patch
+       cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
        # update ata_generic to support intel IDE-R
        cd ${KERNEL_SRC}; patch -p1 <../ahci-ata_generic-let-ata_generic-handle-new-MBP-w-MCP89.patch
        cd ${KERNEL_SRC}; patch -p1 <../ata_generic-implement-ATA_GEN_-flags-and-force-enable-DMA-on-MBP-7,1.patch

diff --git a/changelog.Debian b/changelog.Debian
index 730f96e670777a131b36275475170da018d1d7b7..774911808530c8bedaf1bd663a6d2a3f6dc400bc 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -18,6 +18,8 @@ pve-kernel-2.6.32 (2.6.32-46) unstable; urgency=low
   
   * update ata_generic to support intel IDE-R
 
+  * use BIOS default settings for ASPM (fix-aspm-policy.patch)
+
  -- Proxmox Support Team <support@proxmox.com>  Mon, 26 Sep 2011 08:48:39 +0200
 
 pve-kernel-2.6.32 (2.6.32-45) unstable; urgency=low

diff --git a/fix-aspm-policy.patch b/fix-aspm-policy.patch
new file mode 100644 (file)
index 0000000..727c6c7
--- /dev/null
+++ b/fix-aspm-policy.patch
@@ -0,0 +1,11 @@
+--- linux-2.6-2.6.32/drivers/pci/pcie/aspm.c.org       2011-09-09 06:51:53.000000000 +0200
++++ linux-2.6-2.6.32/drivers/pci/pcie/aspm.c   2011-09-09 06:52:09.000000000 +0200
+@@ -75,7 +75,7 @@
+ #define POLICY_DEFAULT 0      /* BIOS default setting */
+ #define POLICY_PERFORMANCE 1  /* high performance */
+ #define POLICY_POWERSAVE 2    /* high power saving */
+-static int aspm_policy = POLICY_POWERSAVE;
++static int aspm_policy = POLICY_DEFAULT;
+ static const char *policy_str[] = {
+       [POLICY_DEFAULT] = "default",
+       [POLICY_PERFORMANCE] = "performance",