Commit 9e167214 authored by Colin Ian King's avatar Colin Ian King Committed by Bjorn Helgaas

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 3c076351 ("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/962038Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org
parent d712f686
...@@ -771,6 +771,9 @@ void pcie_clear_aspm(struct pci_bus *bus) ...@@ -771,6 +771,9 @@ void pcie_clear_aspm(struct pci_bus *bus)
{ {
struct pci_dev *child; struct pci_dev *child;
if (aspm_force)
return;
/* /*
* Clear any ASPM setup that the firmware has carried out on this bus * Clear any ASPM setup that the firmware has carried out on this bus
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment