Commit 4949be16 authored Mar 06, 2012 by Matthew Garrett Committed by Jesse Barnes Mar 07, 2012

PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled



Right now we won't touch ASPM state if ASPM is disabled, except in the case
where we find a device that appears to be too old to reliably support ASPM.
Right now we'll clear it in that case, which is almost certainly the wrong
thing to do. The easiest way around this is just to disable the blacklisting
when ASPM is disabled.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

parent 4f262acf

drivers/pci/pcie/aspm.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -500,6 +500,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
		int pos;
		u32 reg32;

		if (aspm_disabled)
		return 0;

		/*
		* Some functions in a slot might not all be PCIe functions,
		* very strange. Disable ASPM for the whole slot