powerpc/pci: Use of_pci_range_parser helper in pci_process_bridge_OF_ranges
This patch updates the implementation of pci_process_bridge_OF_ranges to use the of_pci_range_parser helpers. Signed-off-by: Andrew Murray <amurray@embedded-bits.co.uk> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Andrew Murray
Benjamin Herrenschmidt
Родитель
13ae40370f
Коммит
654837e8fe
|
|
@ -686,60 +686,36 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
|
|||
void pci_process_bridge_OF_ranges(struct pci_controller *hose,
|
||||
struct device_node *dev, int primary)
|
||||
{
|
||||
const __be32 *ranges;
|
||||
int rlen;
|
||||
int pna = of_n_addr_cells(dev);
|
||||
int np = pna + 5;
|
||||
int memno = 0;
|
||||
u32 pci_space;
|
||||
unsigned long long pci_addr, cpu_addr, pci_next, cpu_next, size;
|
||||
struct resource *res;
|
||||
struct of_pci_range range;
|
||||
struct of_pci_range_parser parser;
|
||||
|
||||
printk(KERN_INFO "PCI host bridge %s %s ranges:\n",
|
||||
dev->full_name, primary ? "(primary)" : "");
|
||||
|
||||
/* Get ranges property */
|
||||
ranges = of_get_property(dev, "ranges", &rlen);
|
||||
if (ranges == NULL)
|
||||
/* Check for ranges property */
|
||||
if (of_pci_range_parser_init(&parser, dev))
|
||||
return;
|
||||
|
||||
/* Parse it */
|
||||
while ((rlen -= np * 4) >= 0) {
|
||||
/* Read next ranges element */
|
||||
pci_space = of_read_number(ranges, 1);
|
||||
pci_addr = of_read_number(ranges + 1, 2);
|
||||
cpu_addr = of_translate_address(dev, ranges + 3);
|
||||
size = of_read_number(ranges + pna + 3, 2);
|
||||
ranges += np;
|
||||
|
||||
for_each_of_pci_range(&parser, &range) {
|
||||
/* If we failed translation or got a zero-sized region
|
||||
* (some FW try to feed us with non sensical zero sized regions
|
||||
* such as power3 which look like some kind of attempt at exposing
|
||||
* the VGA memory hole)
|
||||
*/
|
||||
if (cpu_addr == OF_BAD_ADDR || size == 0)
|
||||
if (range.cpu_addr == OF_BAD_ADDR || range.size == 0)
|
||||
continue;
|
||||
|
||||
/* Now consume following elements while they are contiguous */
|
||||
for (; rlen >= np * sizeof(u32);
|
||||
ranges += np, rlen -= np * 4) {
|
||||
if (of_read_number(ranges, 1) != pci_space)
|
||||
break;
|
||||
pci_next = of_read_number(ranges + 1, 2);
|
||||
cpu_next = of_translate_address(dev, ranges + 3);
|
||||
if (pci_next != pci_addr + size ||
|
||||
cpu_next != cpu_addr + size)
|
||||
break;
|
||||
size += of_read_number(ranges + pna + 3, 2);
|
||||
}
|
||||
|
||||
/* Act based on address space type */
|
||||
res = NULL;
|
||||
switch ((pci_space >> 24) & 0x3) {
|
||||
case 1: /* PCI IO space */
|
||||
switch (range.flags & IORESOURCE_TYPE_BITS) {
|
||||
case IORESOURCE_IO:
|
||||
printk(KERN_INFO
|
||||
" IO 0x%016llx..0x%016llx -> 0x%016llx\n",
|
||||
cpu_addr, cpu_addr + size - 1, pci_addr);
|
||||
range.cpu_addr, range.cpu_addr + range.size - 1,
|
||||
range.pci_addr);
|
||||
|
||||
/* We support only one IO range */
|
||||
if (hose->pci_io_size) {
|
||||
|
|
@ -749,11 +725,12 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
|
|||
}
|
||||
#ifdef CONFIG_PPC32
|
||||
/* On 32 bits, limit I/O space to 16MB */
|
||||
if (size > 0x01000000)
|
||||
size = 0x01000000;
|
||||
if (range.size > 0x01000000)
|
||||
range.size = 0x01000000;
|
||||
|
||||
/* 32 bits needs to map IOs here */
|
||||
hose->io_base_virt = ioremap(cpu_addr, size);
|
||||
hose->io_base_virt = ioremap(range.cpu_addr,
|
||||
range.size);
|
||||
|
||||
/* Expect trouble if pci_addr is not 0 */
|
||||
if (primary)
|
||||
|
|
@ -763,20 +740,20 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
|
|||
/* pci_io_size and io_base_phys always represent IO
|
||||
* space starting at 0 so we factor in pci_addr
|
||||
*/
|
||||
hose->pci_io_size = pci_addr + size;
|
||||
hose->io_base_phys = cpu_addr - pci_addr;
|
||||
hose->pci_io_size = range.pci_addr + range.size;
|
||||
hose->io_base_phys = range.cpu_addr - range.pci_addr;
|
||||
|
||||
/* Build resource */
|
||||
res = &hose->io_resource;
|
||||
res->flags = IORESOURCE_IO;
|
||||
res->start = pci_addr;
|
||||
range.cpu_addr = range.pci_addr;
|
||||
break;
|
||||
case 2: /* PCI Memory space */
|
||||
case 3: /* PCI 64 bits Memory space */
|
||||
case IORESOURCE_MEM:
|
||||
printk(KERN_INFO
|
||||
" MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n",
|
||||
cpu_addr, cpu_addr + size - 1, pci_addr,
|
||||
(pci_space & 0x40000000) ? "Prefetch" : "");
|
||||
range.cpu_addr, range.cpu_addr + range.size - 1,
|
||||
range.pci_addr,
|
||||
(range.pci_space & 0x40000000) ?
|
||||
"Prefetch" : "");
|
||||
|
||||
/* We support only 3 memory ranges */
|
||||
if (memno >= 3) {
|
||||
|
|
@ -785,28 +762,21 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
|
|||
continue;
|
||||
}
|
||||
/* Handles ISA memory hole space here */
|
||||
if (pci_addr == 0) {
|
||||
if (range.pci_addr == 0) {
|
||||
if (primary || isa_mem_base == 0)
|
||||
isa_mem_base = cpu_addr;
|
||||
hose->isa_mem_phys = cpu_addr;
|
||||
hose->isa_mem_size = size;
|
||||
isa_mem_base = range.cpu_addr;
|
||||
hose->isa_mem_phys = range.cpu_addr;
|
||||
hose->isa_mem_size = range.size;
|
||||
}
|
||||
|
||||
/* Build resource */
|
||||
hose->mem_offset[memno] = cpu_addr - pci_addr;
|
||||
hose->mem_offset[memno] = range.cpu_addr -
|
||||
range.pci_addr;
|
||||
res = &hose->mem_resources[memno++];
|
||||
res->flags = IORESOURCE_MEM;
|
||||
if (pci_space & 0x40000000)
|
||||
res->flags |= IORESOURCE_PREFETCH;
|
||||
res->start = cpu_addr;
|
||||
break;
|
||||
}
|
||||
if (res != NULL) {
|
||||
res->name = dev->full_name;
|
||||
res->end = res->start + size - 1;
|
||||
res->parent = NULL;
|
||||
res->sibling = NULL;
|
||||
res->child = NULL;
|
||||
of_pci_range_to_resource(&range, dev, res);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче