summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2012-11-27 14:09:40 +0000
committerBjorn Helgaas <bhelgaas@google.com>2013-01-14 16:23:42 -0700
commit9e16721498b0c3d3ebfa0b503c63d35c0a4c0642 (patch)
treef4ca526220308c5c199904947ee9875294ae8f5f /drivers/pci
parentd712f686ced38e248e510cc6b6f9498791f874cc (diff)
PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported
Right now using pcie_aspm=force will not enable ASPM if the FADT indicates ASPM is unsupported. However, the semantics of force should probably allow for this, especially as they did before 3c076351c4 ("PCI: Rework ASPM disable code") This patch just skips the clearing of any ASPM setup that the firmware has carried out on this bus if pcie_aspm=force is being used. Reference: http://bugs.launchpad.net/bugs/962038 Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: stable@vger.kernel.org
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pcie/aspm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index b52630b8eada..8474b6a4fc9b 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -771,6 +771,9 @@ void pcie_clear_aspm(struct pci_bus *bus)
{
struct pci_dev *child;
+ if (aspm_force)
+ return;
+
/*
* Clear any ASPM setup that the firmware has carried out on this bus
*/