tree 4e756cf04ab4a78f5fb10428dd275124b4b19681
parent ccf21f8533d54a3b3bd2b50d1a65745b6498607b
parent 8ac7d4961f6047338b8f779f56e15cf9c474e086
author Pavankumar Kondeti <pkondeti@codeaurora.org> 1521608511 +0530
committer Pavankumar Kondeti <pkondeti@codeaurora.org> 1521608565 +0530

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

* origin/dev/msm-4.9-sched:
  ARM: dts: msm: Update silver CPUs's idle cost data for SDM845v2
  sched/fair: prevent possible infinite loop in sched_group_energy
  sched: Update WALT stats also in boosted_cpu_util()
  sched/fair: Add provision to control the spreading on SMP
  sched/fair: Add EAS_USE_NEED_IDLE feature
  sched/fair: Turn off FBT_STRICT_ORDER feature
  sched/fair: fix incorrect CPU selection for non latency sensitive tasks
  sched: Add task placement snapshot
  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
  sched: Sync EAS codebase to android-4.9
  sched: Move core_ctl callback from tick to WALT IRQ work
  sched: fair: Always use energy aware wakeups
  sched: Introduce new workload differentiation
  sched: Introduce a different version of freq aggregation
  sched: report group load to the cpufreq
  sched: Start reporting top task load to cpufreq
  sched: Introduce scheduler boost related placement changes
  sched: Port boost setting mechanisms to EAS
  sched: integrate core_ctl with EAS
  sched: EAS: add infrastructure for core_ctl
  sched: EAS: add core isolation support
  sched: Introduce an irq_work to report WALT load
  sched: introduce small wakee task on waker
  sched: fair: Ignore energy-diff calculations for colocated tasks
  sched: change default group upmigrate and downmigrate values
  sched: EAS: colocate related threads
  sched: cpufreq: Use per_cpu_ptr instead of this_cpu_ptr when reporting load
  sched: cpufreq: Use sched_clock instead of rq_clock when updating schedutil
  sched: cpufreq: Update cpufreq once in a WALT window
  ARM: dts: msm: Add an energy model for the SDM845 CPUs

Conflicts:
	kernel/sched/fair.c

Change-Id: Ieaeecb28e57955db3b13d6d9c1d81b204caf0fcf
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>