From: Matthew Garrett Date: Tue, 6 Mar 2012 18:41:49 +0000 (-0500) Subject: PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled X-Git-Tag: upstream/snapshot3+hdmi~8001^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4949be16822e92a18ea0cc1616319926628092ee;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Cc: stable@vger.kernel.org Signed-off-by: Jesse Barnes --- diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 1cfbf22..24f049e 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -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