cpufreq,arm,arm64: restructure definitions of arch_set_freq_scale() (a20b7053) · Commits · 戴 / test

Compared to other arch_* functions, arch_set_freq_scale() has an atypical weak definition that can be replaced by a strong architecture specific implementation. The more typical support for architectural functions involves defining an empty stub in a header file if the symbol is not already defined in architecture code. Some examples involve: - #define arch_scale_freq_capacity topology_get_freq_scale - #define arch_scale_freq_invariant topology_scale_freq_invariant - #define arch_scale_cpu_capacity topology_get_cpu_scale - #define arch_update_cpu_topology topology_update_cpu_topology - #define arch_scale_thermal_pressure topology_get_thermal_pressure - #define arch_set_thermal_pressure topology_set_thermal_pressure Bring arch_set_freq_scale() in line with these functions by renaming it to topology_set_freq_scale() in the arch topology driver, and by defining the arch_set_freq_scale symbol to point to the new function for arm and arm64. While there are other users of the arch_topology driver, this patch defines arch_set_freq_scale for arm and arm64 only, due to their existing definitions of arch_scale_freq_capacity. This is the getter function of the frequency invariance scale factor and without a getter function, the setter function - arch_set_freq_scale() has not purpose. Signed-off-by:

Ionela Voinescu <ionela.voinescu@arm.com> Acked-by:

Viresh Kumar <viresh.kumar@linaro.org> Acked-by:

Catalin Marinas <catalin.marinas@arm.com> Acked-by: Sudeep Holla <sudeep.holla@arm.com> (BL_SWITCHER and topology parts) Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

arch/arm/include/asm/topology.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		#include <linux/arch_topology.h>

		/* Replace task scheduler's default frequency-invariant accounting */
		#define arch_set_freq_scale topology_set_freq_scale
		#define arch_scale_freq_capacity topology_get_freq_scale
		#define arch_scale_freq_invariant topology_scale_freq_invariant

arch/arm64/include/asm/topology.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ void topology_scale_freq_tick(void);
		#endif /* CONFIG_ARM64_AMU_EXTN */

		/* Replace task scheduler's default frequency-invariant accounting */
		#define arch_set_freq_scale topology_set_freq_scale
		#define arch_scale_freq_capacity topology_get_freq_scale
		#define arch_scale_freq_invariant topology_scale_freq_invariant

drivers/base/arch_topology.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ __weak bool arch_freq_counters_available(const struct cpumask *cpus)
		}
		DEFINE_PER_CPU(unsigned long, freq_scale) = SCHED_CAPACITY_SCALE;

		void arch_set_freq_scale(const struct cpumask *cpus, unsigned long cur_freq,
		void topology_set_freq_scale(const struct cpumask *cpus, unsigned long cur_freq,
		unsigned long max_freq)
		{
		unsigned long scale;

drivers/cpufreq/cpufreq.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -160,13 +160,6 @@ 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(const struct cpumask *cpus,
		unsigned long cur_freq,
		unsigned long max_freq)
		{
		}
		EXPORT_SYMBOL_GPL(arch_set_freq_scale);

		/*
		* This is a generic cpufreq init() routine which can be used by cpufreq
		* drivers of SMP systems. It will do following:

include/linux/arch_topology.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ static inline unsigned long topology_get_freq_scale(int cpu)
		return per_cpu(freq_scale, cpu);
		}

		void topology_set_freq_scale(const struct cpumask *cpus, unsigned long cur_freq,
		unsigned long max_freq);
		bool topology_scale_freq_invariant(void);

		bool arch_freq_counters_available(const struct cpumask *cpus);

Admin message