drivers: base: cacheinfo: fix x86 with CONFIG_OF enabled
With CONFIG_OF enabled on x86, we get the following error on boot: " Failed to find cpu0 device node Unable to detect cache hierarchy from DT for CPU 0 " and the cacheinfo fails to get populated in the corresponding sysfs entries. This is because cache_setup_of_node looks for of_node for setting up the shared cpu_map without checking that it's already populated in the architecture specific callback. In order to indicate that the shared cpu_map is already populated, this patch introduces a boolean `cpu_map_populated` in struct cpu_cacheinfo that can be used by the generic code to skip cache_shared_cpu_map_setup. This patch also sets that boolean for x86. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
79543cf2b1
Коммит
fac5148257
|
@ -934,6 +934,8 @@ static int __populate_cache_leaves(unsigned int cpu)
|
||||||
ci_leaf_init(this_leaf++, &id4_regs);
|
ci_leaf_init(this_leaf++, &id4_regs);
|
||||||
__cache_cpumap_setup(cpu, idx, &id4_regs);
|
__cache_cpumap_setup(cpu, idx, &id4_regs);
|
||||||
}
|
}
|
||||||
|
this_cpu_ci->cpu_map_populated = true;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -106,6 +106,9 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)
|
||||||
unsigned int index;
|
unsigned int index;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
if (this_cpu_ci->cpu_map_populated)
|
||||||
|
return 0;
|
||||||
|
|
||||||
ret = cache_setup_of_node(cpu);
|
ret = cache_setup_of_node(cpu);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -71,6 +71,7 @@ struct cpu_cacheinfo {
|
||||||
struct cacheinfo *info_list;
|
struct cacheinfo *info_list;
|
||||||
unsigned int num_levels;
|
unsigned int num_levels;
|
||||||
unsigned int num_leaves;
|
unsigned int num_leaves;
|
||||||
|
bool cpu_map_populated;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Загрузка…
Ссылка в новой задаче