diff options
| author | Matthew Garrett <mjg@redhat.com> | 2012-03-06 13:41:49 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-19 08:57:43 -0700 |
| commit | 9217bfbbade56ef9dfee88773c2105e619028fa1 (patch) | |
| tree | 1d0f0db2f60226a2c994b8d0a0bf106e3806b94a /drivers/pci | |
| parent | 5bcb3f882ab97f3ebb4c4abd435704ad24c565cb (diff) | |
| download | kernel_samsung_smdk4412-9217bfbbade56ef9dfee88773c2105e619028fa1.zip kernel_samsung_smdk4412-9217bfbbade56ef9dfee88773c2105e619028fa1.tar.gz kernel_samsung_smdk4412-9217bfbbade56ef9dfee88773c2105e619028fa1.tar.bz2 | |
PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled
commit 4949be16822e92a18ea0cc1616319926628092ee upstream.
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>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pcie/aspm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index e25af67..56a6966 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 |