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

Commit 01ca13d8 authored by Todd Kjos's avatar Todd Kjos
Browse files

Merge branch 'eas-dev' into android-mainline 



Merge android-specific EAS patches

Bug: 120440300
Change-Id: I9e9c3dff41f1e941e57390db971d58a1457c69a3
Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
parents c0c91924 f3e98119

arch/arm/include/asm/topology.h

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ const struct cpumask *cpu_coregroup_mask(int cpu); 
/* Replace task scheduler's default frequency-invariant accounting */

#define arch_scale_freq_capacity topology_get_freq_scale



/* Replace task scheduler's default max-frequency-invariant accounting */

#define arch_scale_max_freq_capacity topology_get_max_freq_scale



/* Replace task scheduler's default cpu-invariant accounting */

#define arch_scale_cpu_capacity topology_get_cpu_scale

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ CONFIG_COMPAT=y 
CONFIG_RANDOMIZE_BASE=y

CONFIG_HIBERNATION=y

CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y

CONFIG_ENERGY_MODEL=y

CONFIG_ARM_CPUIDLE=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT=y

arch/arm64/include/asm/topology.h

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ int pcibus_to_node(struct pci_bus *bus); 
/* Replace task scheduler's default frequency-invariant accounting */

#define arch_scale_freq_capacity topology_get_freq_scale



/* Replace task scheduler's default max-frequency-invariant accounting */

#define arch_scale_max_freq_capacity topology_get_max_freq_scale



/* Replace task scheduler's default cpu-invariant accounting */

#define arch_scale_cpu_capacity topology_get_cpu_scale

drivers/base/arch_topology.c

+24 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <linux/cpuset.h>



DEFINE_PER_CPU(unsigned long, freq_scale) = SCHED_CAPACITY_SCALE;

DEFINE_PER_CPU(unsigned long, max_cpu_freq);

DEFINE_PER_CPU(unsigned long, max_freq_scale) = SCHED_CAPACITY_SCALE;



void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,

			 unsigned long max_freq)
@@ -26,8 +28,29 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, 


	scale = (cur_freq << SCHED_CAPACITY_SHIFT) / max_freq;



	for_each_cpu(i, cpus)

	for_each_cpu(i, cpus) {

		per_cpu(freq_scale, i) = scale;

		per_cpu(max_cpu_freq, i) = max_freq;

	}

}



void arch_set_max_freq_scale(struct cpumask *cpus,

			     unsigned long policy_max_freq)

{

	unsigned long scale, max_freq;

	int cpu = cpumask_first(cpus);



	if (cpu > nr_cpu_ids)

		return;



	max_freq = per_cpu(max_cpu_freq, cpu);

	if (!max_freq)

		return;



	scale = (policy_max_freq << SCHED_CAPACITY_SHIFT) / max_freq;



	for_each_cpu(cpu, cpus)

		per_cpu(max_freq_scale, cpu) = scale;

}



DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;

drivers/cpufreq/cpufreq.c

+8 −0
Original line number Diff line number Diff line
@@ -153,6 +153,12 @@ __weak void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, 
}

EXPORT_SYMBOL_GPL(arch_set_freq_scale);



__weak void arch_set_max_freq_scale(struct cpumask *cpus,

				    unsigned long policy_max_freq)

{

}

EXPORT_SYMBOL_GPL(arch_set_max_freq_scale);



/*

 * This is a generic cpufreq init() routine which can be used by cpufreq

 * drivers of SMP systems. It will do following:
@@ -2416,6 +2422,8 @@ int cpufreq_set_policy(struct cpufreq_policy *policy, 
	policy->max = new_policy->max;

	trace_cpu_frequency_limits(policy);



	arch_set_max_freq_scale(policy->cpus, policy->max);



	policy->cached_target_freq = UINT_MAX;



	pr_debug("new min and max freqs are %u - %u kHz\n",