085ae41f66
There were three changes necessary in order to allow
sparc64 to use setup-res.c:
1) Sparc64 roots the PCI I/O and MEM address space using
parent resources contained in the PCI controller structure.
I'm actually surprised no other platforms do this, especially
ones like Alpha and PPC{,64}. These resources get linked into the
iomem/ioport tree when PCI controllers are probed.
So the hierarchy looks like this:
iomem --|
PCI controller 1 MEM space --|
device 1
device 2
etc.
PCI controller 2 MEM space --|
...
ioport --|
PCI controller 1 IO space --|
...
PCI controller 2 IO space --|
...
You get the idea. The drivers/pci/setup-res.c code allocates
using plain iomem_space and ioport_space as the root, so that
wouldn't work with the above setup.
So I added a pcibios_select_root() that is used to handle this.
It uses the PCI controller struct's io_space and mem_space on
sparc64, and io{port,mem}_resource on every other platform to
keep current behavior.
2) quirk_io_region() is buggy. It takes in raw BUS view addresses
and tries to use them as a PCI resource.
pci_claim_resource() expects the resource to be fully formed when
it gets called. The sparc64 implementation would do the translation
but that's absolutely wrong, because if the same resource gets
released then re-claimed we'll adjust things twice.
So I fixed up quirk_io_region() to do the proper pcibios_bus_to_resource()
conversion before passing it on to pci_claim_resource().
3) I was mistakedly __init'ing the function methods the PCI controller
drivers provide on sparc64 to implement some parts of these
routines. This was, of course, easy to fix.
So we end up with the following, and that nasty SPARC64 makefile
ifdef in drivers/pci/Makefile is finally zapped.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
204 lines
5.3 KiB
C
204 lines
5.3 KiB
C
/*
|
|
* drivers/pci/setup-res.c
|
|
*
|
|
* Extruded from code written by
|
|
* Dave Rusling (david.rusling@reo.mts.dec.com)
|
|
* David Mosberger (davidm@cs.arizona.edu)
|
|
* David Miller (davem@redhat.com)
|
|
*
|
|
* Support routines for initializing a PCI subsystem.
|
|
*/
|
|
|
|
/* fixed for multiple pci buses, 1999 Andrea Arcangeli <andrea@suse.de> */
|
|
|
|
/*
|
|
* Nov 2000, Ivan Kokshaysky <ink@jurassic.park.msu.ru>
|
|
* Resource sorting
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/cache.h>
|
|
#include <linux/slab.h>
|
|
#include "pci.h"
|
|
|
|
|
|
void
|
|
pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
|
|
{
|
|
struct pci_bus_region region;
|
|
u32 new, check, mask;
|
|
int reg;
|
|
|
|
/* Ignore resources for unimplemented BARs and unused resource slots
|
|
for 64 bit BARs. */
|
|
if (!res->flags)
|
|
return;
|
|
|
|
pcibios_resource_to_bus(dev, ®ion, res);
|
|
|
|
pr_debug(" got res [%lx:%lx] bus [%lx:%lx] flags %lx for "
|
|
"BAR %d of %s\n", res->start, res->end,
|
|
region.start, region.end, res->flags, resno, pci_name(dev));
|
|
|
|
new = region.start | (res->flags & PCI_REGION_FLAG_MASK);
|
|
if (res->flags & IORESOURCE_IO)
|
|
mask = (u32)PCI_BASE_ADDRESS_IO_MASK;
|
|
else
|
|
mask = (u32)PCI_BASE_ADDRESS_MEM_MASK;
|
|
|
|
if (resno < 6) {
|
|
reg = PCI_BASE_ADDRESS_0 + 4 * resno;
|
|
} else if (resno == PCI_ROM_RESOURCE) {
|
|
if (!(res->flags & IORESOURCE_ROM_ENABLE))
|
|
return;
|
|
new |= PCI_ROM_ADDRESS_ENABLE;
|
|
reg = dev->rom_base_reg;
|
|
} else {
|
|
/* Hmm, non-standard resource. */
|
|
|
|
return; /* kill uninitialised var warning */
|
|
}
|
|
|
|
pci_write_config_dword(dev, reg, new);
|
|
pci_read_config_dword(dev, reg, &check);
|
|
|
|
if ((new ^ check) & mask) {
|
|
printk(KERN_ERR "PCI: Error while updating region "
|
|
"%s/%d (%08x != %08x)\n", pci_name(dev), resno,
|
|
new, check);
|
|
}
|
|
|
|
if ((new & (PCI_BASE_ADDRESS_SPACE|PCI_BASE_ADDRESS_MEM_TYPE_MASK)) ==
|
|
(PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64)) {
|
|
new = region.start >> 16 >> 16;
|
|
pci_write_config_dword(dev, reg + 4, new);
|
|
pci_read_config_dword(dev, reg + 4, &check);
|
|
if (check != new) {
|
|
printk(KERN_ERR "PCI: Error updating region "
|
|
"%s/%d (high %08x != %08x)\n",
|
|
pci_name(dev), resno, new, check);
|
|
}
|
|
}
|
|
res->flags &= ~IORESOURCE_UNSET;
|
|
pr_debug("PCI: moved device %s resource %d (%lx) to %x\n",
|
|
pci_name(dev), resno, res->flags,
|
|
new & ~PCI_REGION_FLAG_MASK);
|
|
}
|
|
|
|
int __devinit
|
|
pci_claim_resource(struct pci_dev *dev, int resource)
|
|
{
|
|
struct resource *res = &dev->resource[resource];
|
|
struct resource *root = NULL;
|
|
char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
|
|
int err;
|
|
|
|
root = pcibios_select_root(dev, res);
|
|
|
|
err = -EINVAL;
|
|
if (root != NULL)
|
|
err = insert_resource(root, res);
|
|
|
|
if (err) {
|
|
printk(KERN_ERR "PCI: %s region %d of %s %s [%lx:%lx]\n",
|
|
root ? "Address space collision on" :
|
|
"No parent found for",
|
|
resource, dtype, pci_name(dev), res->start, res->end);
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
int pci_assign_resource(struct pci_dev *dev, int resno)
|
|
{
|
|
struct pci_bus *bus = dev->bus;
|
|
struct resource *res = dev->resource + resno;
|
|
unsigned long size, min, align;
|
|
int ret;
|
|
|
|
size = res->end - res->start + 1;
|
|
min = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM;
|
|
/* The bridge resources are special, as their
|
|
size != alignment. Sizing routines return
|
|
required alignment in the "start" field. */
|
|
align = (resno < PCI_BRIDGE_RESOURCES) ? size : res->start;
|
|
|
|
/* First, try exact prefetching match.. */
|
|
ret = pci_bus_alloc_resource(bus, res, size, align, min,
|
|
IORESOURCE_PREFETCH,
|
|
pcibios_align_resource, dev);
|
|
|
|
if (ret < 0 && (res->flags & IORESOURCE_PREFETCH)) {
|
|
/*
|
|
* That failed.
|
|
*
|
|
* But a prefetching area can handle a non-prefetching
|
|
* window (it will just not perform as well).
|
|
*/
|
|
ret = pci_bus_alloc_resource(bus, res, size, align, min, 0,
|
|
pcibios_align_resource, dev);
|
|
}
|
|
|
|
if (ret) {
|
|
printk(KERN_ERR "PCI: Failed to allocate %s resource #%d:%lx@%lx for %s\n",
|
|
res->flags & IORESOURCE_IO ? "I/O" : "mem",
|
|
resno, size, res->start, pci_name(dev));
|
|
} else if (resno < PCI_BRIDGE_RESOURCES) {
|
|
pci_update_resource(dev, res, resno);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Sort resources by alignment */
|
|
void __devinit
|
|
pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
|
struct resource *r;
|
|
struct resource_list *list, *tmp;
|
|
unsigned long r_align;
|
|
|
|
r = &dev->resource[i];
|
|
r_align = r->end - r->start;
|
|
|
|
if (!(r->flags) || r->parent)
|
|
continue;
|
|
if (!r_align) {
|
|
printk(KERN_WARNING "PCI: Ignore bogus resource %d "
|
|
"[%lx:%lx] of %s\n",
|
|
i, r->start, r->end, pci_name(dev));
|
|
continue;
|
|
}
|
|
r_align = (i < PCI_BRIDGE_RESOURCES) ? r_align + 1 : r->start;
|
|
for (list = head; ; list = list->next) {
|
|
unsigned long align = 0;
|
|
struct resource_list *ln = list->next;
|
|
int idx;
|
|
|
|
if (ln) {
|
|
idx = ln->res - &ln->dev->resource[0];
|
|
align = (idx < PCI_BRIDGE_RESOURCES) ?
|
|
ln->res->end - ln->res->start + 1 :
|
|
ln->res->start;
|
|
}
|
|
if (r_align > align) {
|
|
tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
|
|
if (!tmp)
|
|
panic("pdev_sort_resources(): "
|
|
"kmalloc() failed!\n");
|
|
tmp->next = ln;
|
|
tmp->res = r;
|
|
tmp->dev = dev;
|
|
list->next = tmp;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|