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

Commit 465c00ab authored by Pavankumar Kondeti's avatar Pavankumar Kondeti
Browse files

Merge remote-tracking branch 'origin/tmp-e93894ce' into dev/msm-4.9-sched 



* origin/tmp-e93894ce:
  sched/fair: select the most energy-efficient CPU candidate on wake-up
  sched/fair: fix array out of bounds access in select_energy_cpu_idx()
  sched/fair: use min capacity when evaluating active cpus
  sched/fair: use min capacity when evaluating idle backup cpus
  sched/fair: use min capacity when evaluating placement energy costs
  sched/fair: introduce minimum capacity capping sched feature
  arm/topology: link arch_scale_min_freq_capacity to cpufreq
  arm64/topology: link arch_scale_min_freq_capacity to cpufreq
  sched: add arch_scale_min_freq_capacity to track minimum capacity caps
  cpufreq: add scaled minimum capacity tracking for policy changes
  arm64: enable max frequency capping
  arm: enable max frequency capping
  cpufreq: implement max frequency capping
  sched/fair: introduce an arch scaling function for max frequency capping
  cpufreq: remove max frequency capping from scale_freq_capacity()
  Revert "ANDROID: cpufreq: Max freq invariant scheduler load-tracking and cpu capacity support"
  Revert "ANDROID: arm: Enable max freq invariant scheduler load-tracking and capacity support"
  Revert "ANDROID: arm64: Enable max freq invariant scheduler load-tracking and capacity support"
  sched/fair: reduce rounding errors in energy computations
  sched/fair: re-factor energy_diff to use a single (extensible) energy_env
  sched/fair: cleanup select_energy_cpu_brute to be more consistent
  sched/fair: remove capacity tracking from energy_diff
  sched/fair: remove energy_diff tracepoint in preparation to re-factoring
  sched/fair: use *p to reference task_structs
  sched: EAS: Fix the calculation of group util in group_idle_state()
  cpufreq: Drop schedfreq governor

Change-Id: I2d89b3c9535b4a28b9b0c2e809191996f23ee600
Signed-off-by: default avatarPavankumar Kondeti <pkondeti@codeaurora.org>
parents 25ba1fac e93894ce

arch/arm/include/asm/topology.h

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ unsigned long arch_get_cpu_efficiency(int cpu); 


#ifdef CONFIG_CPU_FREQ

#define arch_scale_freq_capacity cpufreq_scale_freq_capacity

#define arch_scale_max_freq_capacity cpufreq_scale_max_freq_capacity

#define arch_scale_min_freq_capacity cpufreq_scale_min_freq_capacity

#endif

#define arch_scale_cpu_capacity scale_cpu_capacity

extern unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu);

arch/arm/kernel/topology.c

+0 −6
Original line number Diff line number Diff line
@@ -54,13 +54,7 @@ static void set_power_scale(unsigned int cpu, unsigned long power) 


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)

arch/arm64/include/asm/topology.h

+4 −1
Original line number Diff line number Diff line
@@ -36,7 +36,10 @@ struct sched_domain; 
#ifdef CONFIG_CPU_FREQ

#define arch_scale_freq_capacity cpufreq_scale_freq_capacity

extern unsigned long cpufreq_scale_freq_capacity(struct sched_domain *sd, int cpu);

extern unsigned long cpufreq_scale_max_freq_capacity(int cpu);

#define arch_scale_max_freq_capacity cpufreq_scale_max_freq_capacity

extern unsigned long cpufreq_scale_max_freq_capacity(struct sched_domain *sd, int cpu);

#define arch_scale_min_freq_capacity cpufreq_scale_min_freq_capacity

extern unsigned long cpufreq_scale_min_freq_capacity(struct sched_domain *sd, int cpu);

#endif

#define arch_scale_cpu_capacity scale_cpu_capacity

extern unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu);

arch/arm64/kernel/topology.c

+0 −6
Original line number Diff line number Diff line
@@ -50,13 +50,7 @@ static void set_power_scale(unsigned int cpu, unsigned long power) 


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)

drivers/cpufreq/Kconfig

+0 −21
Original line number Diff line number Diff line
@@ -102,14 +102,6 @@ config CPU_FREQ_DEFAULT_GOV_CONSERVATIVE 
	  governor. If unsure have a look at the help section of the

	  driver. Fallback governor will be the performance governor.



config CPU_FREQ_DEFAULT_GOV_SCHED

	bool "sched"

	select CPU_FREQ_GOV_SCHED

	help

	  Use the CPUfreq governor 'sched' as default. This scales

	  cpu frequency using CPU utilization estimates from the

	  scheduler.



config CPU_FREQ_DEFAULT_GOV_INTERACTIVE

	bool "interactive"

	select CPU_FREQ_GOV_INTERACTIVE
@@ -238,19 +230,6 @@ config CPU_BOOST 


	  If in doubt, say N.



config CPU_FREQ_GOV_SCHED

	bool "'sched' cpufreq governor"

	depends on CPU_FREQ

	depends on SMP

	select CPU_FREQ_GOV_COMMON

	help

	  'sched' - this governor scales cpu frequency from the

	  scheduler as a function of cpu capacity utilization. It does

	  not evaluate utilization on a periodic basis (as ondemand

	  does) but instead is event-driven by the scheduler.



	  If in doubt, say N.



config CPU_FREQ_GOV_SCHEDUTIL

	bool "'schedutil' cpufreq policy governor"

	depends on CPU_FREQ && SMP