diff options
| author | Peter Denison <openwrt@marshadder.org> | 2008-04-25 20:49:40 +0000 |
|---|---|---|
| committer | Peter Denison <openwrt@marshadder.org> | 2008-04-25 20:49:40 +0000 |
| commit | b6b6155ec81c704cd70157753b38f90fd506e708 (patch) | |
| tree | 0e3521dc9f267b5f130bb1ac1bcdae91c4be11cb /target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch | |
| parent | 5f13c4844e0784ff40c1d15f5077d945ebf17f9b (diff) | |
| download | upstream-b6b6155ec81c704cd70157753b38f90fd506e708.tar.gz upstream-b6b6155ec81c704cd70157753b38f90fd506e708.tar.bz2 upstream-b6b6155ec81c704cd70157753b38f90fd506e708.zip | |
First step to upgrade of brcm47xx to kernel version 2.6.25
SVN-Revision: 10939
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch new file mode 100644 index 0000000000..8ab28a75e2 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch @@ -0,0 +1,21 @@ +The SSB pcicore driver does create some MMIO resource collisions. +However, the pcicore PCI-fixup routine fixes these collisions afterwards. +Remove this sanity check for now until we find a better solution. +--mb +Index: linux-2.6.23.16/arch/mips/pci/pci.c +=================================================================== +--- linux-2.6.23.16.orig/arch/mips/pci/pci.c 2008-02-16 17:55:20.000000000 +0100 ++++ linux-2.6.23.16/arch/mips/pci/pci.c 2008-02-16 17:57:39.000000000 +0100 +@@ -177,10 +177,8 @@ static int pcibios_enable_resources(stru + continue; + + r = &dev->resource[idx]; +- if (!r->start && r->end) { +- printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); +- return -EINVAL; +- } ++ if (!r->start && r->end) ++ printk(KERN_WARNING "PCI: Device %s resource collisions detected. Ignoring...\n", pci_name(dev)); + if (r->flags & IORESOURCE_IO) + cmd |= PCI_COMMAND_IO; + if (r->flags & IORESOURCE_MEM) |