From patchwork Tue Nov 27 14:09:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RESEND] PCI: Allow pcie_aspm=force to work even when FADT indicates it is unsupported Date: Tue, 27 Nov 2012 04:09:40 -0000 From: Colin King X-Patchwork-Id: 202235 Message-Id: <1354025380-19092-1-git-send-email-colin.king@canonical.com> To: Bjorn Helgaas , linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org From: Colin Ian King BugLink: http://bugs.launchpad.net/bugs/962038 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 the ASPM disable rework with commit 3c076351c4027a56d5005a39a0b518a4ba393ce2 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. Signed-off-by: Colin Ian King --- drivers/pci/pcie/aspm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 213753b..449f257 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -773,6 +773,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 */