|
@@ -1161,41 +1161,9 @@ EXPORT_SYMBOL_GPL(pcibios_claim_one_bus);
|
|
|
|
|
|
int pcibios_enable_device(struct pci_dev *dev, int mask)
|
|
int pcibios_enable_device(struct pci_dev *dev, int mask)
|
|
{
|
|
{
|
|
- u16 cmd, old_cmd;
|
|
|
|
- int idx;
|
|
|
|
- struct resource *r;
|
|
|
|
-
|
|
|
|
if (ppc_md.pcibios_enable_device_hook)
|
|
if (ppc_md.pcibios_enable_device_hook)
|
|
if (ppc_md.pcibios_enable_device_hook(dev))
|
|
if (ppc_md.pcibios_enable_device_hook(dev))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
|
|
|
- old_cmd = cmd;
|
|
|
|
- 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 ((idx == PCI_ROM_RESOURCE) &&
|
|
|
|
- (!(r->flags & IORESOURCE_ROM_ENABLE)))
|
|
|
|
- continue;
|
|
|
|
- if (r->parent == NULL) {
|
|
|
|
- printk(KERN_ERR "PCI: Device %s not available because"
|
|
|
|
- " of resource collisions\n", pci_name(dev));
|
|
|
|
- return -EINVAL;
|
|
|
|
- }
|
|
|
|
- if (r->flags & IORESOURCE_IO)
|
|
|
|
- cmd |= PCI_COMMAND_IO;
|
|
|
|
- if (r->flags & IORESOURCE_MEM)
|
|
|
|
- cmd |= PCI_COMMAND_MEMORY;
|
|
|
|
- }
|
|
|
|
- if (cmd != old_cmd) {
|
|
|
|
- printk("PCI: Enabling device %s (%04x -> %04x)\n",
|
|
|
|
- pci_name(dev), old_cmd, cmd);
|
|
|
|
- pci_write_config_word(dev, PCI_COMMAND, cmd);
|
|
|
|
- }
|
|
|
|
- return 0;
|
|
|
|
|
|
+ return pci_enable_resources(dev, mask);
|
|
}
|
|
}
|
|
-
|
|
|