30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
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));
|
|
}
|