aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pcie
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2012-11-27 14:09:40 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-27 20:46:28 -0800
commitef3319d2624e24085982336facc71b414c134f4a (patch)
tree2aed3089b87ed52008e85d3947a612ddf812cae5 /drivers/pci/pcie
parent1085a87765acabfdf55577e4c844a6d4609a6eb2 (diff)
downloadkernel_samsung_smdk4412-ef3319d2624e24085982336facc71b414c134f4a.tar.gz
kernel_samsung_smdk4412-ef3319d2624e24085982336facc71b414c134f4a.tar.bz2
kernel_samsung_smdk4412-ef3319d2624e24085982336facc71b414c134f4a.zip
PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported
commit 9e16721498b0c3d3ebfa0b503c63d35c0a4c0642 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pci/pcie')
-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 0ff0182f176..9b9305ae93a 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -790,6 +790,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
*/