Commit ecddc3a0 authored by Valentin Schneider's avatar Valentin Schneider Committed by Rafael J. Wysocki
Browse files

arch_topology, cpufreq: constify arch_* cpumasks 



The passed cpumask arguments to arch_set_freq_scale() and
arch_freq_counters_available() are only iterated over, so reflect this
in the prototype. This also allows to pass system cpumasks like
cpu_online_mask without getting a warning.

Signed-off-by: default avatarValentin Schneider <valentin.schneider@arm.com>
Signed-off-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 874f6353

arch/arm64/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ free_valid_mask: 
}

late_initcall_sync(init_amu_fie);



bool arch_freq_counters_available(struct cpumask *cpus)

bool arch_freq_counters_available(const struct cpumask *cpus)

{

	return amu_freq_invariant() &&

	       cpumask_subset(cpus, amu_fie_cpus);

drivers/base/arch_topology.c

+2 −2
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ 
#include <linux/sched.h>

#include <linux/smp.h>



__weak bool arch_freq_counters_available(struct cpumask *cpus)

__weak bool arch_freq_counters_available(const struct cpumask *cpus)

{

	return false;

}

DEFINE_PER_CPU(unsigned long, freq_scale) = SCHED_CAPACITY_SCALE;



void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,

void arch_set_freq_scale(const struct cpumask *cpus, unsigned long cur_freq,

			 unsigned long max_freq)

{

	unsigned long scale;

drivers/cpufreq/cpufreq.c

+3 −2
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy) 
}

EXPORT_SYMBOL_GPL(get_cpu_idle_time);



__weak void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,

__weak void arch_set_freq_scale(const struct cpumask *cpus,

				unsigned long cur_freq,

				unsigned long max_freq)

{

}

include/linux/arch_topology.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static inline unsigned long topology_get_freq_scale(int cpu) 
	return per_cpu(freq_scale, cpu);

}



bool arch_freq_counters_available(struct cpumask *cpus);

bool arch_freq_counters_available(const struct cpumask *cpus);



DECLARE_PER_CPU(unsigned long, thermal_pressure);

include/linux/cpufreq.h

+2 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,8 @@ static inline void sched_cpufreq_governor_change(struct cpufreq_policy *policy, 
extern void arch_freq_prepare_all(void);

extern unsigned int arch_freq_get_on_cpu(int cpu);



extern void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,

extern void arch_set_freq_scale(const struct cpumask *cpus,

				unsigned long cur_freq,

				unsigned long max_freq);



/* the following are really really optional */

CRA Git | Maintained and supported by SUSTech CRA and CCSE