From: Sudeep KarkadaNagesha <sudeep.karkadanage...@arm.com> CPU subsystem now provides architecture specific hook to retrieve the of_node. Most of the cpu DT node parsing and initialisation is contained in devtree.c. It's better to contain all CPU device node parsing there.
arch_of_get_cpu_node is mainly used to assign cpu->of_node when CPUs get registered. This patch overrides the defination of the same. It can also act as the helper function in pre-SMP/early initialisation stages to retrieve CPU device node pointers in logical ordering. This mainly helps to avoid replication of the code doing CPU node parsing and physical(MPIDR) to logical mapping. Signed-off-by: Sudeep KarkadaNagesha <sudeep.karkadanage...@arm.com> --- arch/arm/include/asm/prom.h | 1 + arch/arm/kernel/devtree.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h index a219227..96f1682 100644 --- a/arch/arm/include/asm/prom.h +++ b/arch/arm/include/asm/prom.h @@ -18,6 +18,7 @@ extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys); extern void arm_dt_memblock_reserve(void); extern void __init arm_dt_init_cpu_maps(void); +extern struct device_node *arch_of_get_cpu_node(int cpu); #else /* CONFIG_OF */ diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 5859c8b..3431aa9 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -169,6 +169,35 @@ void __init arm_dt_init_cpu_maps(void) } } +struct device_node * __init arch_of_get_cpu_node(int cpu) +{ + struct device_node *cpun, *cpus; + const u32 *cell; + u64 hwid; + int ac; + + cpus = of_find_node_by_path("/cpus"); + if (WARN(!cpus, "Missing cpus node, bailing out\n")) + return NULL; + + if (WARN_ON(of_property_read_u32(cpus, "#address-cells", &ac))) + ac = of_n_addr_cells(cpus); + + for_each_child_of_node(cpus, cpun) { + if (of_node_cmp(cpun->type, "cpu")) + continue; + cell = of_get_property(cpun, "reg", NULL); + if (WARN(!cell, "%s: missing reg property\n", cpun->full_name)) + continue; + + hwid = of_read_number(cell, ac); + if ((hwid & MPIDR_HWID_BITMASK) == cpu_logical_map(cpu)) + return cpun; + } + + return NULL; +} + /** * setup_machine_fdt - Machine setup when an dtb was passed to the kernel * @dt_phys: physical address of dt blob -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/