Re: [ 05/38] PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled

[Greg KH]

On Mon, Mar 19, 2012 at 11:20:34AM +0100, Jiri Slaby wrote:
> On 03/17/2012 12:34 AM, Greg KH wrote:
> > 3.0-stable review patch.  If anyone has any objections, please let me know.
> 
> The commit below is reported to crash the machine in the early init. See
> the first reply to this message (lkml.org seems to be down right now):
> lkml.org/lkml/2012/3/18/132

Yes, but this patch fixes machines that others have been reporting
problems with, so, what am I supposed to do?

I'll stick with this patch for now, and hope that Matthew fixes this up
in Linus's tree and I'll suck that fix in when it gets there.  Is that
ok?

Matthew, you are still working on this, right?  :)

thanks,

greg k-h

> 
> > From: Matthew Garrett <mjg@xxxxxxxxxx>
> > 
> > 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@xxxxxxxxxx>
> > Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> > 
> > ---
> >  drivers/pci/pcie/aspm.c |    3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > --- a/drivers/pci/pcie/aspm.c
> > +++ b/drivers/pci/pcie/aspm.c
> > @@ -500,6 +500,9 @@ static int pcie_aspm_sanity_check(struct
> >  	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
> > 
> > 
> 
> thanks,
> -- 
> js
> suse labs
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/