Commit 4949be16 authored by Matthew Garrett's avatar Matthew Garrett Committed by Jesse Barnes

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: default avatarMatthew Garrett <mjg@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 4f262acf
...@@ -500,6 +500,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev) ...@@ -500,6 +500,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
int pos; int pos;
u32 reg32; u32 reg32;
if (aspm_disabled)
return 0;
/* /*
* Some functions in a slot might not all be PCIe functions, * Some functions in a slot might not all be PCIe functions,
* very strange. Disable ASPM for the whole slot * very strange. Disable ASPM for the whole slot
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment