diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-20 06:54:56 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 08:18:10 +0300 |
| commit | 24f8c827f9b8ab2c8644f7ab85a1b1d58fc0fcf7 (patch) | |
| tree | b9f13bc4004b9300c07f271f7280a17388230736 /arch/powerpc/kernel/pci_32.c | |
| parent | 50c9bc2fc86fddd39eea6a12ceb81585bc2aafaa (diff) | |
| download | linux-24f8c827f9b8ab2c8644f7ab85a1b1d58fc0fcf7.tar.xz | |
[POWERPC] Updates/fixes to 32 bits pcibios_enable_device()
Our implementation of pcibios_enable_device() incorrectly ignores
the mask argument and always checks that all resources have been
allocated, which isn't the right thing to do anymore.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_32.c')
| -rw-r--r-- | arch/powerpc/kernel/pci_32.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index ce7c20c8191f..12b74fd098ee 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c @@ -530,10 +530,16 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) pci_read_config_word(dev, PCI_COMMAND, &cmd); old_cmd = cmd; - for (idx=0; idx<6; idx++) { + for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) { + /* Only set up the requested stuff */ + if (!(mask & (1 << idx))) + continue; r = &dev->resource[idx]; + if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) + continue; if (r->flags & IORESOURCE_UNSET) { - printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); + printk(KERN_ERR "PCI: Device %s not available because" + " of resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) |