PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported
authorColin Ian King <colin.king@canonical.com>
Tue, 27 Nov 2012 14:09:40 +0000 (14:09 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Jan 2013 04:49:01 +0000 (20:49 -0800)
commit48310adbde5b3448b85d6d6d404cc7ee16339ae5
treeb11d6ff39592e48b3cebd9d98b4cc144e2341d37
parent8dd19b22e59d25a3730c3b536ad9cdc2561517bf
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>
drivers/pci/pcie/aspm.c