| Message ID | 1392726043-31088-3-git-send-email-will.deacon@arm.com |
|---|---|
| State | Superseded |
| Headers | show |
On Tue, Feb 18, 2014 at 12:20:42PM +0000, Will Deacon wrote: > This patch moves bios32 over to using the generic code for enabling PCI > resources. Since the core code takes care of bridge resources too, we > can also drop the explicit IO and MEMORY enabling for them in the arch > code. > > A side-effect of this change is that we no longer explicitly enable > devices when running in PCI_PROBE_ONLY mode. This stays closer to the > meaning of the option and prevents us from trying to enable devices > without any assigned resources (the core code refuses to enable > resources without parents). > > Tested-By: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > Tested-by: Jingoo Han <jg1.han@samsung.com> > Signed-off-by: Will Deacon <will.deacon@arm.com> Tested acceptably fine here with crudbus-from-hell. Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>
On Tue, Feb 18, 2014 at 03:41:39PM +0000, Russell King - ARM Linux wrote: > On Tue, Feb 18, 2014 at 12:20:42PM +0000, Will Deacon wrote: > > This patch moves bios32 over to using the generic code for enabling PCI > > resources. Since the core code takes care of bridge resources too, we > > can also drop the explicit IO and MEMORY enabling for them in the arch > > code. > > > > A side-effect of this change is that we no longer explicitly enable > > devices when running in PCI_PROBE_ONLY mode. This stays closer to the > > meaning of the option and prevents us from trying to enable devices > > without any assigned resources (the core code refuses to enable > > resources without parents). > > > > Tested-By: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > > Tested-by: Jingoo Han <jg1.han@samsung.com> > > Signed-off-by: Will Deacon <will.deacon@arm.com> > > Tested acceptably fine here with crudbus-from-hell. > > Tested-by: Russell King <rmk+kernel@arm.linux.org.uk> Cheers Russell. Will -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 317da88ae65b..91f48804e3bb 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -608,41 +608,10 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, */ int pcibios_enable_device(struct pci_dev *dev, int mask) { - u16 cmd, old_cmd; - int idx; - struct resource *r; - - pci_read_config_word(dev, PCI_COMMAND, &cmd); - old_cmd = cmd; - for (idx = 0; idx < 6; idx++) { - /* Only set up the requested stuff */ - if (!(mask & (1 << idx))) - 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->flags & IORESOURCE_IO) - cmd |= PCI_COMMAND_IO; - if (r->flags & IORESOURCE_MEM) - cmd |= PCI_COMMAND_MEMORY; - } + if (pci_has_flag(PCI_PROBE_ONLY)) + return 0; - /* - * Bridges (eg, cardbus bridges) need to be fully enabled - */ - if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE) - cmd |= PCI_COMMAND_IO | 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); } int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,