[PATCH] Ignore pre-1.1 ASPM quirking when ASPM is disabled

[PATCH] Ignore pre-1.1 ASPM quirking when ASPM is disabled

[Matthew Garrett]

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@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

Re: [PATCH] Ignore pre-1.1 ASPM quirking when ASPM is disabled

[Greg KH]

On Tue, Mar 06, 2012 at 01:41:49PM -0500, Matthew Garrett wrote:
> 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@kernel.org

That's <stable@vger.kernel.org> if we want to get it right :)

Anyway, Jesse, this needs to get into 3.3-final to prevent
regressions...

thanks,

greg k-h

Re: [PATCH] Ignore pre-1.1 ASPM quirking when ASPM is disabled

[Jesse Barnes]

On Tue, 6 Mar 2012 21:48:59 -0800
Greg KH <greg@kroah.com> wrote:

> On Tue, Mar 06, 2012 at 01:41:49PM -0500, Matthew Garrett wrote:
> > 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@kernel.org
> 
> That's <stable@vger.kernel.org> if we want to get it right :)
> 
> Anyway, Jesse, this needs to get into 3.3-final to prevent
> regressions...

Any bz links to add to the changelog?  I'll fix up the stable cc when I
commit...

Jesse

Re: [PATCH] Ignore pre-1.1 ASPM quirking when ASPM is disabled

[Greg KH]

On Wed, Mar 07, 2012 at 08:25:53PM -0800, Jesse Barnes wrote:
> On Tue, 6 Mar 2012 21:48:59 -0800
> Greg KH <greg@kroah.com> wrote:
> 
> > On Tue, Mar 06, 2012 at 01:41:49PM -0500, Matthew Garrett wrote:
> > > 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@kernel.org
> > 
> > That's <stable@vger.kernel.org> if we want to get it right :)
> > 
> > Anyway, Jesse, this needs to get into 3.3-final to prevent
> > regressions...
> 
> Any bz links to add to the changelog?  I'll fix up the stable cc when I
> commit...

Not that I know of, there was an email thread about this when I released
the 3.2.5 kernel that talked about the problems with it which caused
this patch to be created.

thanks,

greg k-h