arm64: cpuinfo: add system serial support

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / kernel / topology.c

diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index b5b43af6a7dc14d42e8d1bc56506383b9fc6600f..5b2c67a510d8a5ecbed84300b6118248432a3cc2 100644 (file)
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -29,7 +29,13 @@ static DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;
 
 unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu)
 {
+#ifdef CONFIG_CPU_FREQ
+       unsigned long max_freq_scale = cpufreq_scale_max_freq_capacity(cpu);
+
+       return per_cpu(cpu_scale, cpu) * max_freq_scale >> SCHED_CAPACITY_SHIFT;
+#else
        return per_cpu(cpu_scale, cpu);
+#endif
 }
 
 static void set_capacity_scale(unsigned int cpu, unsigned long capacity)