diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-03-04 13:56:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-21 00:47:04 -0400 |
commit | 842de40d93e00a5c40a1a7f520a6fbe422994e99 (patch) | |
tree | ec59fd64804a4f5cde40f5edf43fabd5ddb3c413 /drivers/pci | |
parent | 7d715a6c1ae5785d00fb9a876b5abdfc43abc44b (diff) |
PCI: add generic pci_enable_resources()
Each architecture has its own pcibios_enable_resources() implementation.
These differ in many minor ways that have nothing to do with actual
architectural differences. Follow-on patches will make most arches
use this generic version instead.
This version is based on powerpc, which seemed most up-to-date. The only
functional difference from the x86 version is that this uses "!r->parent"
to check for resource collisions instead of "!r->start && r->end".
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/setup-res.c | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 9e4d485ba9cd..bad509e40fbc 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c | |||
@@ -263,3 +263,46 @@ void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head) | |||
263 | } | 263 | } |
264 | } | 264 | } |
265 | } | 265 | } |
266 | |||
267 | int pci_enable_resources(struct pci_dev *dev, int mask) | ||
268 | { | ||
269 | u16 cmd, old_cmd; | ||
270 | int i; | ||
271 | struct resource *r; | ||
272 | |||
273 | pci_read_config_word(dev, PCI_COMMAND, &cmd); | ||
274 | old_cmd = cmd; | ||
275 | |||
276 | for (i = 0; i < PCI_NUM_RESOURCES; i++) { | ||
277 | if (!(mask & (1 << i))) | ||
278 | continue; | ||
279 | |||
280 | r = &dev->resource[i]; | ||
281 | |||
282 | if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) | ||
283 | continue; | ||
284 | if ((i == PCI_ROM_RESOURCE) && | ||
285 | (!(r->flags & IORESOURCE_ROM_ENABLE))) | ||
286 | continue; | ||
287 | |||
288 | if (!r->parent) { | ||
289 | dev_err(&dev->dev, "device not available because of " | ||
290 | "BAR %d [%llx:%llx] collisions\n", i, | ||
291 | (unsigned long long) r->start, | ||
292 | (unsigned long long) r->end); | ||
293 | return -EINVAL; | ||
294 | } | ||
295 | |||
296 | if (r->flags & IORESOURCE_IO) | ||
297 | cmd |= PCI_COMMAND_IO; | ||
298 | if (r->flags & IORESOURCE_MEM) | ||
299 | cmd |= PCI_COMMAND_MEMORY; | ||
300 | } | ||
301 | |||
302 | if (cmd != old_cmd) { | ||
303 | dev_info(&dev->dev, "enabling device (%04x -> %04x)\n", | ||
304 | old_cmd, cmd); | ||
305 | pci_write_config_word(dev, PCI_COMMAND, cmd); | ||
306 | } | ||
307 | return 0; | ||
308 | } | ||