p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arch_topology: Localize cap_parsing_failed to topology_parse_cpu_capacity() 

cap_parsing_failed is only required in topology_parse_cpu_capacity() to
know if we have already tried to allocate raw_capacity and failed, or if
at least one of the cpu_node didn't had the required
"capacity-dmips-mhz" property.

All other users can use raw_capacity instead of cap_parsing_failed.

Make sure we set raw_capacity to NULL after we free it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Juri Lelli <juri.lelli@arm.com>
Tested-by: Juri Lelli <juri.lelli@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Viresh Kumar 2017-06-23 14:55:33 +05:30 committed by Greg Kroah-Hartman
parent 805df2966f
commit 62de1161e2
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/base/arch_topology.c
View File

@ -95,14 +95,21 @@ subsys_initcall(register_cpu_capacity_sysctl);
static u32 capacity_scale; static u32 capacity_scale;
static u32 *raw_capacity; static u32 *raw_capacity;
static bool cap_parsing_failed;
static int __init free_raw_capacity(void)
{
kfree(raw_capacity);
raw_capacity = NULL;
return 0;
}
void topology_normalize_cpu_scale(void) void topology_normalize_cpu_scale(void)
{ {
u64 capacity; u64 capacity;
int cpu; int cpu;
if (!raw_capacity || cap_parsing_failed) if (!raw_capacity)
return; return;
pr_debug("cpu_capacity: capacity_scale=%u\n", capacity_scale); pr_debug("cpu_capacity: capacity_scale=%u\n", capacity_scale);
@ -121,6 +128,7 @@ void topology_normalize_cpu_scale(void)
bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)
{ {
static bool cap_parsing_failed;
int ret; int ret;
u32 cpu_capacity; u32 cpu_capacity;
@ -151,7 +159,7 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)
pr_err("cpu_capacity: partial information: fallback to 1024 for all CPUs\n"); pr_err("cpu_capacity: partial information: fallback to 1024 for all CPUs\n");
} }
cap_parsing_failed = true; cap_parsing_failed = true;
kfree(raw_capacity); free_raw_capacity();
} }
return !ret; return !ret;
@ -171,7 +179,7 @@ init_cpu_capacity_callback(struct notifier_block *nb,
struct cpufreq_policy *policy = data; struct cpufreq_policy *policy = data;
int cpu; int cpu;
if (cap_parsing_failed || cap_parsing_done) if (!raw_capacity || cap_parsing_done)
return 0; return 0;
if (val != CPUFREQ_NOTIFY) if (val != CPUFREQ_NOTIFY)
@ -191,7 +199,7 @@ init_cpu_capacity_callback(struct notifier_block *nb,
if (cpumask_empty(cpus_to_visit)) { if (cpumask_empty(cpus_to_visit)) {
topology_normalize_cpu_scale(); topology_normalize_cpu_scale();
kfree(raw_capacity); free_raw_capacity();
pr_debug("cpu_capacity: parsing done\n"); pr_debug("cpu_capacity: parsing done\n");
cap_parsing_done = true; cap_parsing_done = true;
schedule_work(&parsing_done_work); schedule_work(&parsing_done_work);
@ -233,11 +241,5 @@ static void parsing_done_workfn(struct work_struct *work)
} }
#else #else
static int __init free_raw_capacity(void)
{
kfree(raw_capacity);
return 0;
}
core_initcall(free_raw_capacity); core_initcall(free_raw_capacity);
#endif #endif