3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Lawrence <joe.lawre...@stratus.com>
commit a26d5ecb3201c11e03663a8f4a7dedc0c5f85c07 upstream.
Don't allocate and track PCIe ASPM state when "pcie_aspm=off" is specified
on the kernel command line.
Based-on-patch-from: Matthew Garrett <mj...@srcf.ucam.org>
Signed-off-by: Joe Lawrence <joe.lawre...@stratus.com>
Signed-off-by: Bjorn Helgaas <bhelg...@google.com>
Reviewed-by: David Bulkow <david.bul...@stratus.com>
Acked-by: Myron Stowe <myron.st...@redhat.com>
[wyj: Backported to 3.4: context adjust]
Signed-off-by: Yijing Wang <wangyij...@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/pci/pcie/aspm.c | 3 +++
1 file changed, 3 insertions(+)
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -583,6 +583,9 @@ void pcie_aspm_init_link_state(struct pc
struct pcie_link_state *link;
int blacklist = !!pcie_aspm_sanity_check(pdev);
+ if (!aspm_support_enabled)
+ return;
+
if (!pci_is_pcie(pdev) || pdev->link_state)
return;
if (pdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT &&
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
