leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

frv: insert PCI root bus resources for the MB93090 devel motherboard

Browse Source 
Insert PCI root bus resources for the FRV-based MB93090 development kit
motherboard.  This is required because the CPU's window onto the PCI bus
address space is considerably smaller than the CPU's full address space
and non-PCI devices lie outside of the PCI window that we might want to
access.

Without this patch, the PCI root bus uses the platform-level bus
resources, and these are then confined to the PCI window, thus making
platform_device_add() reject devices outside of this window.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Howells 2009-04-21 12:24:51 -07:00 committed by Linus Torvalds
parent 6d029b6451
commit 77e38a554a
1 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
arch/frv/mb93090-mb00/pci-vdk.c
View File

@ -30,6 +30,29 @@ int __nongpreldata pcibios_last_bus = -1;
struct pci_bus *__nongpreldata pci_root_bus; struct pci_bus *__nongpreldata pci_root_bus;
struct pci_ops *__nongpreldata pci_root_ops; struct pci_ops *__nongpreldata pci_root_ops;
/*
* The accessible PCI window does not cover the entire CPU address space, but
* there are devices we want to access outside of that window, so we need to
* insert specific PCI bus resources instead of using the platform-level bus
* resources directly for the PCI root bus.
*
* These are configured and inserted by pcibios_init() and are attached to the
* root bus by pcibios_fixup_bus().
*/
static struct resource pci_ioport_resource = {
.name = "PCI IO",
.start = 0,
.end = IO_SPACE_LIMIT,
.flags = IORESOURCE_IO,
};
static struct resource pci_iomem_resource = {
.name = "PCI mem",
.start = 0,
.end = -1,
.flags = IORESOURCE_MEM,
};
/* /*
* Functions for accessing PCI configuration space * Functions for accessing PCI configuration space
*/ */
@ -304,6 +327,12 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
#if 0 #if 0
printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number); printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);
#endif #endif
if (bus->number == 0) {
bus->resource[0] = &pci_ioport_resource;
bus->resource[1] = &pci_iomem_resource;
}
pci_read_bridge_bases(bus); pci_read_bridge_bases(bus);
if (bus->number == 0) { if (bus->number == 0) {
@ -350,28 +379,36 @@ int __init pcibios_init(void)
/* enable PCI arbitration */ /* enable PCI arbitration */
__reg_MB86943_pci_arbiter = MB86943_PCIARB_EN; __reg_MB86943_pci_arbiter = MB86943_PCIARB_EN;
ioport_resource.start = (__reg_MB86943_sl_pci_io_base << 9) & 0xfffffc00; pci_ioport_resource.start = (__reg_MB86943_sl_pci_io_base << 9) & 0xfffffc00;
ioport_resource.end = (__reg_MB86943_sl_pci_io_range << 9) | 0x3ff; pci_ioport_resource.end = (__reg_MB86943_sl_pci_io_range << 9) | 0x3ff;
ioport_resource.end += ioport_resource.start; pci_ioport_resource.end += pci_ioport_resource.start;
printk("PCI IO window: %08llx-%08llx\n", printk("PCI IO window: %08llx-%08llx\n",
(unsigned long long) ioport_resource.start, (unsigned long long) pci_ioport_resource.start,
(unsigned long long) ioport_resource.end); (unsigned long long) pci_ioport_resource.end);
iomem_resource.start = (__reg_MB86943_sl_pci_mem_base << 9) & 0xfffffc00; pci_iomem_resource.start = (__reg_MB86943_sl_pci_mem_base << 9) & 0xfffffc00;
pci_iomem_resource.end = (__reg_MB86943_sl_pci_mem_range << 9) | 0x3ff;
pci_iomem_resource.end += pci_iomem_resource.start;
/* Reserve somewhere to write to flush posted writes. */ /* Reserve somewhere to write to flush posted writes. This is used by
iomem_resource.start += 0x400; * __flush_PCI_writes() from asm/io.h to force the write FIFO in the
* CPU-PCI bridge to flush as this doesn't happen automatically when a
iomem_resource.end = (__reg_MB86943_sl_pci_mem_range << 9) | 0x3ff; * read is performed on the MB93090 development kit motherboard.
iomem_resource.end += iomem_resource.start; */
pci_iomem_resource.start += 0x400;
printk("PCI MEM window: %08llx-%08llx\n", printk("PCI MEM window: %08llx-%08llx\n",
(unsigned long long) iomem_resource.start, (unsigned long long) pci_iomem_resource.start,
(unsigned long long) iomem_resource.end); (unsigned long long) pci_iomem_resource.end);
printk("PCI DMA memory: %08lx-%08lx\n", printk("PCI DMA memory: %08lx-%08lx\n",
dma_coherent_mem_start, dma_coherent_mem_end); dma_coherent_mem_start, dma_coherent_mem_end);
if (insert_resource(&iomem_resource, &pci_iomem_resource) < 0)
panic("Unable to insert PCI IOMEM resource\n");
if (insert_resource(&ioport_resource, &pci_ioport_resource) < 0)
panic("Unable to insert PCI IOPORT resource\n");
if (!pci_probe) if (!pci_probe)
return -ENXIO; return -ENXIO;