evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "arm: cpu: read all address cells in dt for cpuid"

Browse source 
This reverts commit e6855ed3fe ("arm: cpu: read all
address cells in dt for cpuid"). The address cells read
issue is fixed in upstream commit c84cc7b906 ("ARM:
8616/1: dt: Respect property size when parsing CPUs"),
and both changes conflict and break the parsing of address
cells.

Change-Id: Iafd918ce8623ceb0c701df15bbdbccba165c89dd
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
This commit is contained in:
Neeraj Upadhyay 2017-05-23 20:09:18 +05:30
parent 60be71604a
commit ca48474457
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/kernel/devtree.c
View file

@ -87,9 +87,9 @@ void __init arm_dt_init_cpu_maps(void)
return;
for_each_child_of_node(cpus, cpu) {
const __be32 *cell;
int prop_bytes;
u32 hwid;
const __be32 *cell;
if (of_node_cmp(cpu->type, "cpu"))
continue;
@ -100,13 +100,14 @@ void __init arm_dt_init_cpu_maps(void)
* properties is considered invalid to build the
* cpu_logical_map.
*/
cell = of_get_property(cpu, "reg", NULL);
if (!cell) {
pr_err("%s: missing reg property\n", cpu->full_name);
cell = of_get_property(cpu, "reg", &prop_bytes);
if (!cell || prop_bytes < sizeof(*cell)) {
pr_debug(" * %s missing reg property\n",
cpu->full_name);
of_node_put(cpu);
return;
}
hwid = of_read_number(cell, of_n_addr_cells(cpu));
/*
* Bits n:24 must be set to 0 in the DT since the reg property
* defines the MPIDR[23:0].