Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff481da6 authored by Dietmar Eggemann's avatar Dietmar Eggemann Committed by Quentin Perret
Browse files

ANDROID: sched/fair: add arch scaling function for max frequency capping 



To be able to scale the cpu capacity by this factor introduce a call to
the new arch scaling function arch_scale_max_freq_capacity() in
update_cpu_capacity() and provide a default implementation which returns
SCHED_CAPACITY_SCALE.

Another subsystem (e.g. cpufreq) or architectural or platform specific
code can overwrite this default implementation, exactly as for frequency
and cpu invariance. It has to be enabled by the arch by defining
arch_scale_max_freq_capacity to the actual implementation.

Change-Id: I770a8b1f4f7340e9e314f71c64a765bf880f4b4d
Signed-off-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
( Fixed conflict with scaling against the PELT-based scale_rt_capacity )
Signed-off-by: default avatarQuentin Perret <quentin.perret@arm.com>
parent 5f9e832c

kernel/sched/fair.c

+8 −4
Original line number Diff line number Diff line
@@ -7700,10 +7700,9 @@ static inline void init_sd_lb_stats(struct sd_lb_stats *sds) 
	};

}



static unsigned long scale_rt_capacity(struct sched_domain *sd, int cpu)

static unsigned long scale_rt_capacity(int cpu, unsigned long max)

{

	struct rq *rq = cpu_rq(cpu);

	unsigned long max = arch_scale_cpu_capacity(cpu);

	unsigned long used, free;

	unsigned long irq;
@@ -7725,10 +7724,15 @@ static unsigned long scale_rt_capacity(struct sched_domain *sd, int cpu) 


static void update_cpu_capacity(struct sched_domain *sd, int cpu)

{

	unsigned long capacity = scale_rt_capacity(sd, cpu);

	unsigned long capacity = arch_scale_cpu_capacity(cpu);

	struct sched_group *sdg = sd->groups;



	cpu_rq(cpu)->cpu_capacity_orig = arch_scale_cpu_capacity(cpu);

	cpu_rq(cpu)->cpu_capacity_orig = capacity;



	capacity *= arch_scale_max_freq_capacity(sd, cpu);

	capacity >>= SCHED_CAPACITY_SHIFT;



	capacity = scale_rt_capacity(cpu, capacity);



	if (!capacity)

		capacity = 1;

kernel/sched/sched.h

+9 −0
Original line number Diff line number Diff line
@@ -1942,6 +1942,15 @@ unsigned long arch_scale_freq_capacity(int cpu) 
}

#endif



#ifndef arch_scale_max_freq_capacity

struct sched_domain;

static __always_inline

unsigned long arch_scale_max_freq_capacity(struct sched_domain *sd, int cpu)

{

	return SCHED_CAPACITY_SCALE;

}

#endif



#ifdef CONFIG_SMP

#ifdef CONFIG_PREEMPT