From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:15038 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932459Ab2CFT0j (ORCPT ); Tue, 6 Mar 2012 14:26:39 -0500 From: Matthew Garrett To: linux-kernel@vger.kernel.org Cc: linux-pci@vger.kernel.org, jbarnes@virtuousgeek.org, Matthew Garrett , stable@kernel.org Subject: [PATCH] Ignore pre-1.1 ASPM quirking when ASPM is disabled Date: Tue, 6 Mar 2012 13:41:49 -0500 Message-Id: <1331059309-4335-1-git-send-email-mjg@redhat.com> Sender: linux-pci-owner@vger.kernel.org List-ID: 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@kernel.org --- 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 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 -- 1.7.7.6