[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>
This commit is contained in:
parent
50c9bc2fc8
commit
24f8c827f9
|
@ -530,10 +530,16 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
|
||||||
|
|
||||||
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
||||||
old_cmd = 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];
|
r = &dev->resource[idx];
|
||||||
|
if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
|
||||||
|
continue;
|
||||||
if (r->flags & IORESOURCE_UNSET) {
|
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;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
if (r->flags & IORESOURCE_IO)
|
if (r->flags & IORESOURCE_IO)
|
||||||
|
|
Loading…
Reference in New Issue