* Dell Studio 1536 needs pci=nocrs to boot.
@ 2011-12-30 19:37 Dave Jones
2012-01-01 14:53 ` Ingo Molnar
0 siblings, 1 reply; 12+ messages in thread
From: Dave Jones @ 2011-12-30 19:37 UTC (permalink / raw)
To: Linux Kernel; +Cc: x86, jbarnes
Some machines don't boot unless passed pci=nocrs.
(See https://bugzilla.redhat.com/show_bug.cgi?id=770308 for details of
one report. Waiting on dmidecode output for others).
Currently there is a DMI whitelist, even though the default is on.
This patch extends that dmi list to add a blacklist to automatically
apply disable it when necessary.
Signed-off-by: Dave Jones <davej@redhat.com>
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 404f21a..2704a9c 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -24,6 +24,12 @@ static int __init set_use_crs(const struct dmi_system_id *id)
return 0;
}
+static int __init set_nouse_crs(const struct dmi_system_id *id)
+{
+ pci_use_crs = false;
+ return 0;
+}
+
static const struct dmi_system_id pci_use_crs_table[] __initconst = {
/* http://bugzilla.kernel.org/show_bug.cgi?id=14183 */
{
@@ -54,6 +60,18 @@ static const struct dmi_system_id pci_use_crs_table[] __initconst = {
DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
},
},
+
+ /* Now for the blacklist.. */
+
+ /* https://bugzilla.redhat.com/show_bug.cgi?id=770308 */
+ {
+ .callback = set_nouse_crs,
+ .ident = "Dell Studio 1536",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_BOARD_NAME, "0M273C"),
+ },
+ },
{}
};
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: Dell Studio 1536 needs pci=nocrs to boot.
2011-12-30 19:37 Dell Studio 1536 needs pci=nocrs to boot Dave Jones
@ 2012-01-01 14:53 ` Ingo Molnar
2012-01-03 17:30 ` Jesse Barnes
0 siblings, 1 reply; 12+ messages in thread
From: Ingo Molnar @ 2012-01-01 14:53 UTC (permalink / raw)
To: Dave Jones, Linux Kernel, x86, jbarnes
* Dave Jones <davej@redhat.com> wrote:
> Some machines don't boot unless passed pci=nocrs.
> (See https://bugzilla.redhat.com/show_bug.cgi?id=770308 for details of
> one report. Waiting on dmidecode output for others).
>
> Currently there is a DMI whitelist, even though the default is on.
>
> This patch extends that dmi list to add a blacklist to automatically
> apply disable it when necessary.
>
> Signed-off-by: Dave Jones <davej@redhat.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Jesse, will you take this one?
Thanks,
Ingo
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Dell Studio 1536 needs pci=nocrs to boot.
2012-01-01 14:53 ` Ingo Molnar
@ 2012-01-03 17:30 ` Jesse Barnes
2012-01-03 17:55 ` Bjorn Helgaas
0 siblings, 1 reply; 12+ messages in thread
From: Jesse Barnes @ 2012-01-03 17:30 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Dave Jones, Linux Kernel, x86, Bjorn Helgaas
[-- Attachment #1: Type: text/plain, Size: 794 bytes --]
On Sun, 1 Jan 2012 15:53:54 +0100
Ingo Molnar <mingo@elte.hu> wrote:
>
> * Dave Jones <davej@redhat.com> wrote:
>
> > Some machines don't boot unless passed pci=nocrs.
> > (See https://bugzilla.redhat.com/show_bug.cgi?id=770308 for details of
> > one report. Waiting on dmidecode output for others).
> >
> > Currently there is a DMI whitelist, even though the default is on.
> >
> > This patch extends that dmi list to add a blacklist to automatically
> > apply disable it when necessary.
> >
> > Signed-off-by: Dave Jones <davej@redhat.com>
>
> Acked-by: Ingo Molnar <mingo@elte.hu>
>
> Jesse, will you take this one?
Yeah, I can take it. Bjorn, any comment (I'll bounce over the
original)?
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Dell Studio 1536 needs pci=nocrs to boot.
2012-01-03 17:30 ` Jesse Barnes
@ 2012-01-03 17:55 ` Bjorn Helgaas
2012-01-03 18:00 ` Dave Jones
2012-01-04 16:33 ` Add Dell Studio 1557 to pci=nocrs blacklist Dave Jones
0 siblings, 2 replies; 12+ messages in thread
From: Bjorn Helgaas @ 2012-01-03 17:55 UTC (permalink / raw)
To: Jesse Barnes; +Cc: Ingo Molnar, Dave Jones, Linux Kernel, x86
On Tue, Jan 3, 2012 at 10:30 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> On Sun, 1 Jan 2012 15:53:54 +0100
> Ingo Molnar <mingo@elte.hu> wrote:
>
>>
>> * Dave Jones <davej@redhat.com> wrote:
>>
>> > Some machines don't boot unless passed pci=nocrs.
>> > (See https://bugzilla.redhat.com/show_bug.cgi?id=770308 for details of
>> > one report. Waiting on dmidecode output for others).
>> >
>> > Currently there is a DMI whitelist, even though the default is on.
>> >
>> > This patch extends that dmi list to add a blacklist to automatically
>> > apply disable it when necessary.
>> >
>> > Signed-off-by: Dave Jones <davej@redhat.com>
>>
>> Acked-by: Ingo Molnar <mingo@elte.hu>
>>
>> Jesse, will you take this one?
>
> Yeah, I can take it. Bjorn, any comment (I'll bounce over the
> original)?
This is a band-aid, and we'll have to extend the blacklist for other
machines, but it's the best we have right now, so I think it's the
right thing to do.
It's probably the same as
https://bugzilla.kernel.org/show_bug.cgi?id=31602 (Dell 1546) and
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/647043
Bjorn
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Dell Studio 1536 needs pci=nocrs to boot.
2012-01-03 17:55 ` Bjorn Helgaas
@ 2012-01-03 18:00 ` Dave Jones
2012-01-06 17:32 ` Bjorn Helgaas
2012-01-04 16:33 ` Add Dell Studio 1557 to pci=nocrs blacklist Dave Jones
1 sibling, 1 reply; 12+ messages in thread
From: Dave Jones @ 2012-01-03 18:00 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Jesse Barnes, Ingo Molnar, Linux Kernel, x86
On Tue, Jan 03, 2012 at 10:55:00AM -0700, Bjorn Helgaas wrote:
> On Tue, Jan 3, 2012 at 10:30 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > On Sun, 1 Jan 2012 15:53:54 +0100
> > Ingo Molnar <mingo@elte.hu> wrote:
> >
> >>
> >> * Dave Jones <davej@redhat.com> wrote:
> >>
> >> > Some machines don't boot unless passed pci=nocrs.
> >> > (See https://bugzilla.redhat.com/show_bug.cgi?id=770308 for details of
> >> > one report. Waiting on dmidecode output for others).
> >> >
> >> > Currently there is a DMI whitelist, even though the default is on.
> >> >
> >> > This patch extends that dmi list to add a blacklist to automatically
> >> > apply disable it when necessary.
> >> >
> >> > Signed-off-by: Dave Jones <davej@redhat.com>
> >>
> >> Acked-by: Ingo Molnar <mingo@elte.hu>
> >>
> >> Jesse, will you take this one?
> >
> > Yeah, I can take it. Bjorn, any comment (I'll bounce over the
> > original)?
>
> This is a band-aid, and we'll have to extend the blacklist for other
> machines, but it's the best we have right now, so I think it's the
> right thing to do.
>
> It's probably the same as
> https://bugzilla.kernel.org/show_bug.cgi?id=31602 (Dell 1546) and
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/647043
There's at least one more dell (Seems that entire 'studio' product line
is affected) that I'm waiting on DMI data from.
Also a thinkpad that I have a patch pending for.
Dave
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Dell Studio 1536 needs pci=nocrs to boot.
2012-01-03 18:00 ` Dave Jones
@ 2012-01-06 17:32 ` Bjorn Helgaas
2012-01-06 17:57 ` Dave Jones
0 siblings, 1 reply; 12+ messages in thread
From: Bjorn Helgaas @ 2012-01-06 17:32 UTC (permalink / raw)
To: Dave Jones, Bjorn Helgaas, Jesse Barnes, Ingo Molnar,
Linux Kernel, x86
On Tue, Jan 3, 2012 at 11:00 AM, Dave Jones <davej@redhat.com> wrote:
> On Tue, Jan 03, 2012 at 10:55:00AM -0700, Bjorn Helgaas wrote:
> > On Tue, Jan 3, 2012 at 10:30 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > > On Sun, 1 Jan 2012 15:53:54 +0100
> > > Ingo Molnar <mingo@elte.hu> wrote:
> > >
> > >>
> > >> * Dave Jones <davej@redhat.com> wrote:
> > >>
> > >> > Some machines don't boot unless passed pci=nocrs.
> > >> > (See https://bugzilla.redhat.com/show_bug.cgi?id=770308 for details of
> > >> > one report. Waiting on dmidecode output for others).
> > >> >
> > >> > Currently there is a DMI whitelist, even though the default is on.
> > >> >
> > >> > This patch extends that dmi list to add a blacklist to automatically
> > >> > apply disable it when necessary.
> > >> >
> > >> > Signed-off-by: Dave Jones <davej@redhat.com>
> > >>
> > >> Acked-by: Ingo Molnar <mingo@elte.hu>
> > >>
> > >> Jesse, will you take this one?
> > >
> > > Yeah, I can take it. Bjorn, any comment (I'll bounce over the
> > > original)?
> >
> > This is a band-aid, and we'll have to extend the blacklist for other
> > machines, but it's the best we have right now, so I think it's the
> > right thing to do.
> >
> > It's probably the same as
> > https://bugzilla.kernel.org/show_bug.cgi?id=31602 (Dell 1546) and
> > https://bugs.launchpad.net/ubuntu/+source/linux/+bug/647043
>
> There's at least one more dell (Seems that entire 'studio' product line
> is affected) that I'm waiting on DMI data from.
> Also a thinkpad that I have a patch pending for.
I think we should drop the Dell 1536 blacklist entry from this patch
(adding set_nouse_crs() itself is fine and may be needed for other
machines).
The patches here: https://lkml.org/lkml/2012/1/5/402 should cover the
Dell 1536 issue as well as the Dell 1546 and any others with the same
BIOS defect.
Bjorn
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Dell Studio 1536 needs pci=nocrs to boot.
2012-01-06 17:32 ` Bjorn Helgaas
@ 2012-01-06 17:57 ` Dave Jones
2012-01-06 20:10 ` Jesse Barnes
0 siblings, 1 reply; 12+ messages in thread
From: Dave Jones @ 2012-01-06 17:57 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Jesse Barnes, Ingo Molnar, Linux Kernel, x86
On Fri, Jan 06, 2012 at 10:32:14AM -0700, Bjorn Helgaas wrote:
> > There's at least one more dell (Seems that entire 'studio' product line
> > is affected) that I'm waiting on DMI data from.
> > Also a thinkpad that I have a patch pending for.
>
> I think we should drop the Dell 1536 blacklist entry from this patch
> (adding set_nouse_crs() itself is fine and may be needed for other
> machines).
>
> The patches here: https://lkml.org/lkml/2012/1/5/402 should cover the
> Dell 1536 issue as well as the Dell 1546 and any others with the same
> BIOS defect.
Sounds good to me.
Dave
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Dell Studio 1536 needs pci=nocrs to boot.
2012-01-06 17:57 ` Dave Jones
@ 2012-01-06 20:10 ` Jesse Barnes
0 siblings, 0 replies; 12+ messages in thread
From: Jesse Barnes @ 2012-01-06 20:10 UTC (permalink / raw)
To: Dave Jones; +Cc: Bjorn Helgaas, Ingo Molnar, Linux Kernel, x86
[-- Attachment #1: Type: text/plain, Size: 929 bytes --]
On Fri, 6 Jan 2012 12:57:58 -0500
Dave Jones <davej@redhat.com> wrote:
> On Fri, Jan 06, 2012 at 10:32:14AM -0700, Bjorn Helgaas wrote:
>
> > > There's at least one more dell (Seems that entire 'studio' product line
> > > is affected) that I'm waiting on DMI data from.
> > > Also a thinkpad that I have a patch pending for.
> >
> > I think we should drop the Dell 1536 blacklist entry from this patch
> > (adding set_nouse_crs() itself is fine and may be needed for other
> > machines).
> >
> > The patches here: https://lkml.org/lkml/2012/1/5/402 should cover the
> > Dell 1536 issue as well as the Dell 1546 and any others with the same
> > BIOS defect.
>
> Sounds good to me.
Ok just did some patch mangling in linux-next. After a quick build
test I'll push it out and you guys can make sure you're happy with
things.
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Add Dell Studio 1557 to pci=nocrs blacklist
2012-01-03 17:55 ` Bjorn Helgaas
2012-01-03 18:00 ` Dave Jones
@ 2012-01-04 16:33 ` Dave Jones
2012-01-04 17:08 ` Jesse Barnes
2012-01-04 18:37 ` Ingo Molnar
1 sibling, 2 replies; 12+ messages in thread
From: Dave Jones @ 2012-01-04 16:33 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Jesse Barnes, Ingo Molnar, Linux Kernel, x86
The Dell Studio 1557 also doesn't suspend correctly when CRS is enabled.
Details at https://bugzilla.redhat.com/show_bug.cgi?id=769657
Reported-by: Gregory S. Hoerner <ghoerner@transcendingthought.com>
Signed-off-by: Dave Jones <davej@redhat.com>
--- linux-3.1.noarch/arch/x86/pci/acpi.c~ 2012-01-04 11:19:36.783664477 -0500
+++ linux-3.1.noarch/arch/x86/pci/acpi.c 2012-01-04 11:23:42.403666272 -0500
@@ -75,6 +75,16 @@ static const struct dmi_system_id pci_us
/* https://bugzilla.redhat.com/show_bug.cgi?id=769657 */
{
.callback = set_nouse_crs,
+ .ident = "Dell Studio 1557",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557");
+ DMI_MATCH(DMI_BIOS_VERSION, "A09"),
+ },
+ },
+ /* https://bugzilla.redhat.com/show_bug.cgi?id=769657 */
+ {
+ .callback = set_nouse_crs,
.ident = "Thinkpad SL510",
.matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: Add Dell Studio 1557 to pci=nocrs blacklist
2012-01-04 16:33 ` Add Dell Studio 1557 to pci=nocrs blacklist Dave Jones
@ 2012-01-04 17:08 ` Jesse Barnes
2012-01-04 18:37 ` Ingo Molnar
1 sibling, 0 replies; 12+ messages in thread
From: Jesse Barnes @ 2012-01-04 17:08 UTC (permalink / raw)
To: Dave Jones; +Cc: Bjorn Helgaas, Ingo Molnar, Linux Kernel, x86
[-- Attachment #1: Type: text/plain, Size: 1478 bytes --]
On Wed, 4 Jan 2012 11:33:12 -0500
Dave Jones <davej@redhat.com> wrote:
> The Dell Studio 1557 also doesn't suspend correctly when CRS is enabled.
> Details at https://bugzilla.redhat.com/show_bug.cgi?id=769657
>
> Reported-by: Gregory S. Hoerner <ghoerner@transcendingthought.com>
> Signed-off-by: Dave Jones <davej@redhat.com>
>
> --- linux-3.1.noarch/arch/x86/pci/acpi.c~ 2012-01-04 11:19:36.783664477 -0500
> +++ linux-3.1.noarch/arch/x86/pci/acpi.c 2012-01-04 11:23:42.403666272 -0500
> @@ -75,6 +75,16 @@ static const struct dmi_system_id pci_us
> /* https://bugzilla.redhat.com/show_bug.cgi?id=769657 */
> {
> .callback = set_nouse_crs,
> + .ident = "Dell Studio 1557",
> + .matches = {
> + DMI_MATCH(DMI_BOARD_VENDOR, "Dell Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557");
> + DMI_MATCH(DMI_BIOS_VERSION, "A09"),
> + },
> + },
> + /* https://bugzilla.redhat.com/show_bug.cgi?id=769657 */
> + {
> + .callback = set_nouse_crs,
> .ident = "Thinkpad SL510",
> .matches = {
> DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>
Looks like this depends on a Thinkpad patch you haven't sent yet; did
you mean to?
I've fixed it up by hand and applied both the 1536 and 1557 patches to
my for-linus branch. I'll see if Linus wants to take it before he
releases (doubtful, but it would be nice if these machines just worked
with the new kernel).
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: Add Dell Studio 1557 to pci=nocrs blacklist
2012-01-04 16:33 ` Add Dell Studio 1557 to pci=nocrs blacklist Dave Jones
2012-01-04 17:08 ` Jesse Barnes
@ 2012-01-04 18:37 ` Ingo Molnar
2012-01-11 16:07 ` Bjorn Helgaas
1 sibling, 1 reply; 12+ messages in thread
From: Ingo Molnar @ 2012-01-04 18:37 UTC (permalink / raw)
To: Dave Jones, Bjorn Helgaas, Jesse Barnes, Linux Kernel, x86
* Dave Jones <davej@redhat.com> wrote:
> The Dell Studio 1557 also doesn't suspend correctly when CRS is enabled.
> Details at https://bugzilla.redhat.com/show_bug.cgi?id=769657
>
> Reported-by: Gregory S. Hoerner <ghoerner@transcendingthought.com>
> Signed-off-by: Dave Jones <davej@redhat.com>
>
> --- linux-3.1.noarch/arch/x86/pci/acpi.c~ 2012-01-04 11:19:36.783664477 -0500
> +++ linux-3.1.noarch/arch/x86/pci/acpi.c 2012-01-04 11:23:42.403666272 -0500
> @@ -75,6 +75,16 @@ static const struct dmi_system_id pci_us
> /* https://bugzilla.redhat.com/show_bug.cgi?id=769657 */
> {
> .callback = set_nouse_crs,
> + .ident = "Dell Studio 1557",
> + .matches = {
> + DMI_MATCH(DMI_BOARD_VENDOR, "Dell Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557");
> + DMI_MATCH(DMI_BIOS_VERSION, "A09"),
Btw., should we perhaps match on all things 'Studio*'? For these
two systems i'm sure there's 20 other models we have not covered
yet ...
Thanks,
Ingo
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: Add Dell Studio 1557 to pci=nocrs blacklist
2012-01-04 18:37 ` Ingo Molnar
@ 2012-01-11 16:07 ` Bjorn Helgaas
0 siblings, 0 replies; 12+ messages in thread
From: Bjorn Helgaas @ 2012-01-11 16:07 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Dave Jones, Jesse Barnes, Linux Kernel, x86, linux-pci
On Wed, Jan 4, 2012 at 11:37 AM, Ingo Molnar <mingo@elte.hu> wrote:
>
> * Dave Jones <davej@redhat.com> wrote:
>
>> The Dell Studio 1557 also doesn't suspend correctly when CRS is enabled.
>> Details at https://bugzilla.redhat.com/show_bug.cgi?id=769657
>>
>> Reported-by: Gregory S. Hoerner <ghoerner@transcendingthought.com>
>> Signed-off-by: Dave Jones <davej@redhat.com>
>>
>> --- linux-3.1.noarch/arch/x86/pci/acpi.c~ 2012-01-04 11:19:36.783664477 -0500
>> +++ linux-3.1.noarch/arch/x86/pci/acpi.c 2012-01-04 11:23:42.403666272 -0500
>> @@ -75,6 +75,16 @@ static const struct dmi_system_id pci_us
>> /* https://bugzilla.redhat.com/show_bug.cgi?id=769657 */
>> {
>> .callback = set_nouse_crs,
>> + .ident = "Dell Studio 1557",
>> + .matches = {
>> + DMI_MATCH(DMI_BOARD_VENDOR, "Dell Inc."),
>> + DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557");
>> + DMI_MATCH(DMI_BIOS_VERSION, "A09"),
>
> Btw., should we perhaps match on all things 'Studio*'? For these
> two systems i'm sure there's 20 other models we have not covered
> yet ...
+linux-pci
I think we should hold off on merging this patch upstream. We don't
understand the root cause yet, and I haven't seen any evidence that
setting "pci=nocrs" actually makes a difference in PCI resource
allocation (https://bugzilla.redhat.com/show_bug.cgi?id=769657#c27)
Bjorn
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-01-11 16:08 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-30 19:37 Dell Studio 1536 needs pci=nocrs to boot Dave Jones
2012-01-01 14:53 ` Ingo Molnar
2012-01-03 17:30 ` Jesse Barnes
2012-01-03 17:55 ` Bjorn Helgaas
2012-01-03 18:00 ` Dave Jones
2012-01-06 17:32 ` Bjorn Helgaas
2012-01-06 17:57 ` Dave Jones
2012-01-06 20:10 ` Jesse Barnes
2012-01-04 16:33 ` Add Dell Studio 1557 to pci=nocrs blacklist Dave Jones
2012-01-04 17:08 ` Jesse Barnes
2012-01-04 18:37 ` Ingo Molnar
2012-01-11 16:07 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox