| Message ID | 20090520164910.6939b92b@jbarnes-g45 (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Wed, May 20, 2009 at 4:49 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote: > On Fri, 8 May 2009 16:40:10 -0600 > Bjorn Helgaas <bjorn.helgaas@hp.com> wrote: >> Did anything happen with this? >> >> The longer we wait to make "use_crs" the default, the harder it >> will be, so I'd like to push ahead. > > Here's a patch to make CRS the default.  If it looks ok I can push it > into my linux-next branch.  I'm all for using reliable data from the > BIOS.  I guess we'll find out fairly quickly if this stuff isn't... > > -- > Jesse Barnes, Intel Open Source Technology Center > > diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt > index 90b3924..8d798bf 100644 > --- a/Documentation/kernel-parameters.txt > +++ b/Documentation/kernel-parameters.txt > @@ -1777,7 +1777,7 @@ and is between 256 and 4096 characters. It is defined in the file >                 IRQ routing is enabled. >         noacpi      [X86] Do not use ACPI for IRQ routing >                 or for PCI scanning. > -        use_crs     [X86] Use _CRS for PCI resource > +        nocrs      [X86] Don't use _CRS for PCI resource >                 allocation. >         routeirq     Do IRQ routing for all PCI devices. >                 This is normally done in pci_enable_device(), > diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h > index e60fd3e..010c08c 100644 > --- a/arch/x86/include/asm/pci_x86.h > +++ b/arch/x86/include/asm/pci_x86.h > @@ -25,7 +25,7 @@ >  #define PCI_BIOS_IRQ_SCAN    0x2000 >  #define PCI_ASSIGN_ALL_BUSSES  0x4000 >  #define PCI_CAN_SKIP_ISA_ALIGN 0x8000 > -#define PCI_USE__CRS      0x10000 > +#define PCI_NO_CRS       0x10000 PCI_NO_ROOT_CRS is more accurate ? YH -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday 20 May 2009 5:49:10 pm Jesse Barnes wrote: > On Fri, 8 May 2009 16:40:10 -0600 > Bjorn Helgaas <bjorn.helgaas@hp.com> wrote: > > Did anything happen with this? > > > > The longer we wait to make "use_crs" the default, the harder it > > will be, so I'd like to push ahead. > > Here's a patch to make CRS the default. If it looks ok I can push it > into my linux-next branch. I'm all for using reliable data from the > BIOS. I guess we'll find out fairly quickly if this stuff isn't... Thanks for following up on this, Jesse. It was on my to-do list for yesterday, but I didn't get to it. Yinghai mentioned a specific box where we might have trouble, but we never got enough details to really debug it. So I think we might as well give it a shot and fine-tune it as we need to. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, May 21, 2009 at 08:46:17AM -0600, Bjorn Helgaas wrote: > On Wednesday 20 May 2009 5:49:10 pm Jesse Barnes wrote: > > On Fri, 8 May 2009 16:40:10 -0600 > > Bjorn Helgaas <bjorn.helgaas@hp.com> wrote: > > > Did anything happen with this? > > > > > > The longer we wait to make "use_crs" the default, the harder it > > > will be, so I'd like to push ahead. > > > > Here's a patch to make CRS the default. If it looks ok I can push it > > into my linux-next branch. I'm all for using reliable data from the > > BIOS. I guess we'll find out fairly quickly if this stuff isn't... > > Thanks for following up on this, Jesse. It was on my to-do list for > yesterday, but I didn't get to it. > > Yinghai mentioned a specific box where we might have trouble, but we > never got enough details to really debug it. So I think we might as > well give it a shot and fine-tune it as we need to. I just remembered that Andrew Morton once raised some concerns related to the number of _CRS returned resources exceeding the fixed resource array size -> http://lkml.org/lkml/2007/11/1/49 I believe PCI_BUS_NUM_RESOURCES was later increased but if that increase was insufficient to cover all systems that the code will now be exposed to, it seems like the "And should we really be silently ignoring this problem? Should we at least report it?" comment that was not addressed could become relevent. Gary
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 90b3924..8d798bf 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1777,7 +1777,7 @@ and is between 256 and 4096 characters. It is defined in the file IRQ routing is enabled. noacpi [X86] Do not use ACPI for IRQ routing or for PCI scanning. - use_crs [X86] Use _CRS for PCI resource + nocrs [X86] Don't use _CRS for PCI resource allocation. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index e60fd3e..010c08c 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -25,7 +25,7 @@ #define PCI_BIOS_IRQ_SCAN 0x2000 #define PCI_ASSIGN_ALL_BUSSES 0x4000 #define PCI_CAN_SKIP_ISA_ALIGN 0x8000 -#define PCI_USE__CRS 0x10000 +#define PCI_NO_CRS 0x10000 #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 #define PCI_HAS_IO_ECS 0x40000 #define PCI_NOASSIGN_ROMS 0x80000 diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index c0ecf25..9f562a3 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -217,7 +217,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do #endif } - if (bus && (pci_probe & PCI_USE__CRS)) + if (bus && !(pci_probe & PCI_NO_CRS)) get_current_resources(device, busnum, domain, bus); return bus; } diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index f893d6a..cfed6b1 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c @@ -101,7 +101,7 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b) struct pci_root_info *info; /* don't go for it if _CRS is used */ - if (pci_probe & PCI_USE__CRS) + if (!(pci_probe & PCI_NO_CRS) return; /* if only one root bus, don't need to anything */ diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 2202b62..3e361c7 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -515,8 +515,8 @@ char * __devinit pcibios_setup(char *str) } else if (!strcmp(str, "assign-busses")) { pci_probe |= PCI_ASSIGN_ALL_BUSSES; return NULL; - } else if (!strcmp(str, "use_crs")) { - pci_probe |= PCI_USE__CRS; + } else if (!strcmp(str, "nocrs")) { + pci_probe |= PCI_NO_CRS; return NULL; } else if (!strcmp(str, "earlydump")) { pci_early_dump_regs = 1;