leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pci: tegra: use #address-/size-cells from DT

Browse Source 
The number of cells used by each entry in the DT ranges property is
determined by the #address-cells/#size-cells properties. Fix the code
to respect this.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Stephen Warren 2015-10-05 17:00:41 -06:00 committed by Tom Warren
parent bec05246f6
commit 223ddbcb09
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/pci/pci_tegra.c
View File

@ -406,9 +406,34 @@ static int tegra_pcie_get_xbar_config(const void *fdt, int node, u32 lanes,
static int tegra_pcie_parse_dt_ranges(const void *fdt, int node,
struct tegra_pcie *pcie)
{
int parent, na_parent, na_pcie, ns_pcie;
const u32 *ptr, *end;
int len;
parent = fdt_parent_offset(fdt, node);
if (parent < 0) {
error("Can't find PCI parent node\n");
return -FDT_ERR_NOTFOUND;
}
na_parent = fdt_address_cells(fdt, parent);
if (na_parent < 1) {
error("bad #address-cells for PCIE parent\n");
return -FDT_ERR_NOTFOUND;
}
na_pcie = fdt_address_cells(fdt, node);
if (na_pcie < 1) {
error("bad #address-cells for PCIE\n");
return -FDT_ERR_NOTFOUND;
}
ns_pcie = fdt_size_cells(fdt, node);
if (ns_pcie < 1) {
error("bad #size-cells for PCIE\n");
return -FDT_ERR_NOTFOUND;
}
ptr = fdt_getprop(fdt, node, "ranges", &len);
if (!ptr) {
error("missing \"ranges\" property");
@ -437,11 +462,13 @@ static int tegra_pcie_parse_dt_ranges(const void *fdt, int node,
}
if (res) {
res->start = fdt32_to_cpu(ptr[3]);
res->end = res->start + fdt32_to_cpu(ptr[5]);
int start_low = na_pcie + (na_parent - 1);
int size_low = na_pcie + na_parent + (ns_pcie - 1);
res->start = fdt32_to_cpu(ptr[start_low]);
res->end = res->start + fdt32_to_cpu(ptr[size_low]);
}
ptr += 3 + 1 + 2;
ptr += na_pcie + na_parent + ns_pcie;
}
debug("PCI regions:\n");