mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
arm,arm64,drivers: reduce scope of cap_parsing_failed
Reduce the scope of cap_parsing_failed (making it static in drivers/base/arch_topology.c) by slightly changing {arm,arm64} DT parsing code. For arm checking for !cap_parsing_failed before calling normalize_ cpu_capacity() is superfluous, as returning an error from parse_ cpu_capacity() (above) means cap_from _dt is set to false. For arm64 we can simply check if raw_capacity points to something, which is not if capacity parsing has failed. Suggested-by: Morten Rasmussen <morten.rasmussen@arm.com> Signed-off-by: Juri Lelli <juri.lelli@arm.com> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2ef7a2953c
commit
c105aa3118
3 changed files with 4 additions and 8 deletions
|
@ -76,7 +76,6 @@ static unsigned long *__cpu_capacity;
|
|||
|
||||
static unsigned long middle_capacity = 1;
|
||||
static bool cap_from_dt = true;
|
||||
extern bool cap_parsing_failed;
|
||||
extern void normalize_cpu_capacity(void);
|
||||
extern int __init parse_cpu_capacity(struct device_node *cpu_node, int cpu);
|
||||
|
||||
|
@ -165,7 +164,7 @@ static void __init parse_dt_topology(void)
|
|||
middle_capacity = ((max_capacity / 3)
|
||||
>> (SCHED_CAPACITY_SHIFT-1)) + 1;
|
||||
|
||||
if (cap_from_dt && !cap_parsing_failed)
|
||||
if (cap_from_dt)
|
||||
normalize_cpu_capacity();
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include <asm/cputype.h>
|
||||
#include <asm/topology.h>
|
||||
|
||||
extern bool cap_parsing_failed;
|
||||
extern void normalize_cpu_capacity(void);
|
||||
extern int __init parse_cpu_capacity(struct device_node *cpu_node, int cpu);
|
||||
|
||||
|
@ -187,10 +186,8 @@ static int __init parse_dt_topology(void)
|
|||
* cluster with restricted subnodes.
|
||||
*/
|
||||
map = of_get_child_by_name(cn, "cpu-map");
|
||||
if (!map) {
|
||||
cap_parsing_failed = true;
|
||||
if (!map)
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = parse_cluster(map, 0);
|
||||
if (ret != 0)
|
||||
|
|
|
@ -95,7 +95,7 @@ subsys_initcall(register_cpu_capacity_sysctl);
|
|||
|
||||
static u32 capacity_scale;
|
||||
static u32 *raw_capacity;
|
||||
bool cap_parsing_failed;
|
||||
static bool cap_parsing_failed;
|
||||
|
||||
void normalize_cpu_capacity(void)
|
||||
{
|
||||
|
@ -210,7 +210,7 @@ static int __init register_cpufreq_notifier(void)
|
|||
* until we have the necessary code to parse the cpu capacity, so
|
||||
* skip registering cpufreq notifier.
|
||||
*/
|
||||
if (!acpi_disabled || cap_parsing_failed)
|
||||
if (!acpi_disabled || !raw_capacity)
|
||||
return -EINVAL;
|
||||
|
||||
if (!alloc_cpumask_var(&cpus_to_visit, GFP_KERNEL)) {
|
||||
|
|
Loading…
Reference in a new issue