rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another fix for ASPM powersave mode

This commit is contained in:
Chuck Ebbert 2011-04-26 23:44:48 -04:00
parent caf1c2222c
commit 915385f9f0
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel.spec
View File

@ -631,9 +631,13 @@ Patch204: linux-2.6-debug-always-inline-kzalloc.patch
Patch380: linux-2.6-defaults-pci_no_msi.patch
Patch381: linux-2.6-defaults-pci_use_crs.patch
Patch383: linux-2.6-defaults-aspm.patch
Patch385: ima-allow-it-to-be-completely-disabled-and-default-off.patch
# ASPM: enable powersave by default
Patch383: linux-2.6-defaults-aspm.patch
Patch384: pci-pcie-links-may-not-get-configured-for-aspm-under-powersave-mode.patch
Patch385: pci-enable-aspm-state-clearing-regardless-of-policy.patch
Patch389: ima-allow-it-to-be-completely-disabled-and-default-off.patch
Patch390: linux-2.6-defaults-acpi-video.patch
Patch391: linux-2.6-acpi-video-dos.patch
@ -717,7 +721,6 @@ Patch12200: acpi_reboot.patch
# Runtime power management
Patch12203: linux-2.6-usb-pci-autosuspend.patch
Patch12204: linux-2.6-enable-more-pci-autosuspend.patch
Patch12207: pci-pcie-links-may-not-get-configured-for-aspm-under-powersave-mode.patch
Patch12303: dmar-disable-when-ricoh-multifunction.patch
@ -1236,8 +1239,9 @@ ApplyPatch linux-2.6-defaults-pci_no_msi.patch
ApplyPatch linux-2.6-defaults-pci_use_crs.patch
# enable ASPM by default on hardware we expect to work
ApplyPatch linux-2.6-defaults-aspm.patch
#
# fixes for ASPM powersave mode
ApplyPatch pci-pcie-links-may-not-get-configured-for-aspm-under-powersave-mode.patch
ApplyPatch pci-enable-aspm-state-clearing-regardless-of-policy.patch
#ApplyPatch ima-allow-it-to-be-completely-disabled-and-default-off.patch
@ -1962,6 +1966,9 @@ fi
# and build.
%changelog
* Tue Apr 26 2011 Chuck Ebbert <cebbert@redhat.com>
- Another fix for ASPM powersave mode
* Mon Apr 25 2011 Jarod Wilson <jarod@redhat.com>
- ite-cir: fix modular build on powerpc (#698378)
- mceusb: add Dell-branded transceiver device ID

29
pci-enable-aspm-state-clearing-regardless-of-policy.patch Normal file
View File

@ -0,0 +1,29 @@
From: Alex Williamson <alex.williamson@redhat.com>
Date: Thu, 10 Mar 2011 18:54:16 +0000 (-0700)
Subject: PCI: Enable ASPM state clearing regardless of policy
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjbarnes%2Fpci-2.6.git;a=commitdiff_plain;h=1a4e6a3c049bba1574c2a80af44f0ceb5c1abf83
PCI: Enable ASPM state clearing regardless of policy
Commit 2f671e2d allowed us to clear ASPM state when the FADT
tells us it isn't supported, but we don't put this into effect
if the aspm_policy is set to POLICY_POWERSAVE. Enable the
state to be cleared regardless of policy.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index eee09f7..3eb667b 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -608,7 +608,7 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)
* the BIOS's expectation, we'll do so once pci_enable_device() is
* called.
*/
- if (aspm_policy != POLICY_POWERSAVE) {
+ if (aspm_policy != POLICY_POWERSAVE || aspm_clear_state) {
pcie_config_aspm_path(link);
pcie_set_clkpm(link, policy_to_clkpm_state(link));
}