On Monday 14 August 2006 21.56, Dave Hansen wrote: > On Mon, 2006-08-14 at 20:21 +0200, Daniel Ritz wrote: > > errm...sorry, i didn't mean that patch but the alternative i sent later. attached. > > it should use direct access while not breaking legacy PCI probing. in theory.. > > > > thanks, > > -daniel > > > > diff --git a/arch/i386/pci/init.c b/arch/i386/pci/init.c > > index c7650a7..51087a9 100644 > > --- a/arch/i386/pci/init.c > > +++ b/arch/i386/pci/init.c > > @@ -14,8 +14,12 @@ #endif > > #ifdef CONFIG_PCI_BIOS > > pci_pcbios_init(); > > #endif > > - if (raw_pci_ops) > > - return 0; > > + /* > > + * don't check for raw_pci_ops here because we want pcbios as last > > + * fallback, yet it's needed to run first to set pcibios_last_bus > > + * in case legacy PCI probing is used. otherwise detecting peer busses > > + * fails. > > + */ > > #ifdef CONFIG_PCI_DIRECT > > pci_direct_init(); > > #endif > > That one works on my box without any issues. Thanks! nice! thanks for testing. Andrew/Greg could you add the patch to your trees? attached again with a better description. rgds -daniel ----- [PATCH] PCI: use PCBIOS as last fallback there was a change in 2.6.17 which affected the order in which the PCI access methods are probed. this gives regressions on some machines with broken BIOS. the problem is that PCBIOS sometimes reports last bus wrong, leaving cardbus non-funcational. previously those system worked fine with direct access. the patch changes the PCI init code to have PCBIOS as last fallback, yet the PCBIOS code still has to run first to set pcibios_last_bus to the value reported by the BIOS. this is needed in case legacy PCI probing (arch/i386/pci/legacy.c) is used to detect peer busses. using direct access if available fixes the cardbus problems. Signed-off-by: Daniel Ritz <daniel.ritz@xxxxxx> diff --git a/arch/i386/pci/init.c b/arch/i386/pci/init.c index c7650a7..51087a9 100644 --- a/arch/i386/pci/init.c +++ b/arch/i386/pci/init.c @@ -14,8 +14,12 @@ #endif #ifdef CONFIG_PCI_BIOS pci_pcbios_init(); #endif - if (raw_pci_ops) - return 0; + /* + * don't check for raw_pci_ops here because we want pcbios as last + * fallback, yet it's needed to run first to set pcibios_last_bus + * in case legacy PCI probing is used. otherwise detecting peer busses + * fails. + */ #ifdef CONFIG_PCI_DIRECT pci_direct_init(); #endif - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
