>From 108cca7bee5b04f45d9712507d14b5f3fbc22c29 Mon Sep 17 00:00:00 2001 From: Joe Lawrence <joe.lawrence@xxxxxxxxxxx> Date: Tue, 15 Jan 2013 15:31:28 -0500 Subject: [PATCH 2/2] PCI: Don't touch ASPM if forcibly disabled Don't allocate and track PCIe ASPM state when "pcie_aspm=off" is specified on the kernel parameter list. Based-on-patch-from: Matthew Garrett <mjg59@xxxxxxxxxxxxx> Reviewed-by: David Bulkow <david.bulkow@xxxxxxxxxxx> Signed-off-by: Joe Lawrence <joe.lawrence@xxxxxxxxxxx> --- 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 6122447..f912a93 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -556,6 +556,9 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev) 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 (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT && -- 1.8.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
