lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: of/pci: Use of_pci_range_parser

Browse Source 
This patch converts the pci_load_of_ranges function to use the new common
of_pci_range_parser.

Signed-off-by: Andrew Murray <amurray@embedded-bits.co.uk>
Signed-off-by: Andrew Murray <Andrew.Murray@arm.com>
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Reviewed-by: Rob Herring <rob.herring@calxeda.com>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-mips@linux-mips.org
Cc: jason@lakedaemon.net
Patchwork: https://patchwork.linux-mips.org/patch/5625/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Andrew Murray
2013-07-25 17:14:25 +01:00
committed by Ralf Baechle
parent 8eae19ccae
commit cffe00c037
1 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
arch/mips/pci/pci.c
View File

@@ -120,51 +120,37 @@ static void pcibios_scanbus(struct pci_controller *hose)
#ifdef CONFIG_OF #ifdef CONFIG_OF
void pci_load_of_ranges(struct pci_controller *hose, struct device_node *node) void pci_load_of_ranges(struct pci_controller *hose, struct device_node *node)
{ {
const __be32 *ranges; struct of_pci_range range;
int rlen; struct of_pci_range_parser parser;
int pna = of_n_addr_cells(node);
int np = pna + 5;
pr_info("PCI host bridge %s ranges:\n", node->full_name); pr_info("PCI host bridge %s ranges:\n", node->full_name);
ranges = of_get_property(node, "ranges", &rlen);
if (ranges == NULL)
return;
hose->of_node = node; hose->of_node = node;
while ((rlen -= np * 4) >= 0) { if (of_pci_range_parser_init(&parser, node))
u32 pci_space; return;
struct resource *res = NULL;
u64 addr, size;
pci_space = be32_to_cpup(&ranges[0]); for_each_of_pci_range(&parser, &range) {
addr = of_translate_address(node, ranges + 3); struct resource *res = NULL;
size = of_read_number(ranges + pna + 3, 2);
ranges += np; switch (range.flags & IORESOURCE_TYPE_BITS) {
switch ((pci_space >> 24) & 0x3) { case IORESOURCE_IO:
case 1: /* PCI IO space */
pr_info(" IO 0x%016llx..0x%016llx\n", pr_info(" IO 0x%016llx..0x%016llx\n",
addr, addr + size - 1); range.cpu_addr,
range.cpu_addr + range.size - 1);
hose->io_map_base = hose->io_map_base =
(unsigned long)ioremap(addr, size); (unsigned long)ioremap(range.cpu_addr,
range.size);
res = hose->io_resource; res = hose->io_resource;
res->flags = IORESOURCE_IO;
break; break;
case 2: /* PCI Memory space */ case IORESOURCE_MEM:
case 3: /* PCI 64 bits Memory space */
pr_info(" MEM 0x%016llx..0x%016llx\n", pr_info(" MEM 0x%016llx..0x%016llx\n",
addr, addr + size - 1); range.cpu_addr,
range.cpu_addr + range.size - 1);
res = hose->mem_resource; res = hose->mem_resource;
res->flags = IORESOURCE_MEM;
break; break;
} }
if (res != NULL) { if (res != NULL)
res->start = addr; of_pci_range_to_resource(&range, node, res);
res->name = node->full_name;
res->end = res->start + size - 1;
res->parent = NULL;
res->sibling = NULL;
res->child = NULL;
}
} }
} }