Commit a26d5ecb authored by Joe Lawrence's avatar Joe Lawrence Committed by Bjorn Helgaas
Browse files

PCI/ASPM: Don't touch ASPM if forcibly disabled



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 <mjg59@srcf.ucam.org>
Signed-off-by: default avatarJoe Lawrence <joe.lawrence@stratus.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarDavid Bulkow <david.bulkow@stratus.com>
Acked-by: default avatarMyron Stowe <myron.stowe@redhat.com>
parent 84fb913c
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -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 &&