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

Commit b368c67c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cpufreq: interactive: Implement cluster-based min_sample_time"

parents 1d40ec31 41b3127c

drivers/cpufreq/cpufreq_interactive.c

+16 −5
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct cpufreq_interactive_cpuinfo { 
	unsigned int floor_freq;

	unsigned int max_freq;

	u64 floor_validate_time;

	u64 local_fvtime; /* per-cpu floor_validate_time */

	u64 hispeed_validate_time; /* cluster hispeed_validate_time */

	u64 local_hvtime; /* per-cpu hispeed_validate_time */

	u64 max_freq_hyst_start_time;
@@ -402,6 +403,7 @@ static void cpufreq_interactive_timer(unsigned long data) 
	unsigned int index;

	unsigned long flags;

	struct cpufreq_govinfo int_info;

	u64 max_fvtime;



	if (!down_read_trylock(&pcpu->enable_sem))

		return;
@@ -500,9 +502,10 @@ static void cpufreq_interactive_timer(unsigned long data) 
	 * Do not scale below floor_freq unless we have been at or above the

	 * floor frequency for the minimum sample time since last validated.

	 */

	if (new_freq < pcpu->floor_freq) {

		if (now - pcpu->floor_validate_time <

				tunables->min_sample_time) {

	max_fvtime = max(pcpu->floor_validate_time, pcpu->local_fvtime);

	if (new_freq < pcpu->floor_freq &&

	    pcpu->target_freq >= pcpu->policy->cur) {

		if (now - max_fvtime < tunables->min_sample_time) {

			trace_cpufreq_interactive_notyet(

				data, cpu_load, pcpu->target_freq,

				pcpu->policy->cur, new_freq);
@@ -521,7 +524,9 @@ static void cpufreq_interactive_timer(unsigned long data) 


	if (!tunables->boosted || new_freq > tunables->hispeed_freq) {

		pcpu->floor_freq = new_freq;

		pcpu->floor_validate_time = now;

		if (pcpu->target_freq >= pcpu->policy->cur ||

		    new_freq >= pcpu->policy->cur)

			pcpu->local_fvtime = now;

	}



	if (new_freq == pcpu->policy->max)
@@ -610,7 +615,7 @@ static int cpufreq_interactive_speedchange_task(void *data) 
			unsigned int j;

			unsigned int max_freq = 0;

			struct cpufreq_interactive_cpuinfo *pjcpu;

			u64 hvt = ~0ULL;

			u64 hvt = ~0ULL, fvt = 0;



			pcpu = &per_cpu(cpuinfo, cpu);

			if (!down_read_trylock(&pcpu->enable_sem))
@@ -623,6 +628,7 @@ static int cpufreq_interactive_speedchange_task(void *data) 
			for_each_cpu(j, pcpu->policy->cpus) {

				pjcpu = &per_cpu(cpuinfo, j);



				fvt = max(fvt, pjcpu->local_fvtime);

				if (pjcpu->target_freq > max_freq) {

					max_freq = pjcpu->target_freq;

					hvt = pjcpu->local_hvtime;
@@ -630,6 +636,10 @@ static int cpufreq_interactive_speedchange_task(void *data) 
					hvt = min(hvt, pjcpu->local_hvtime);

				}

			}

			for_each_cpu(j, pcpu->policy->cpus) {

				pjcpu = &per_cpu(cpuinfo, j);

				pjcpu->floor_validate_time = fvt;

			}



			if (max_freq != pcpu->policy->cur) {

				__cpufreq_driver_target(pcpu->policy,
@@ -1592,6 +1602,7 @@ static int cpufreq_governor_interactive(struct cpufreq_policy *policy, 
			pcpu->floor_freq = pcpu->target_freq;

			pcpu->floor_validate_time =

				ktime_to_us(ktime_get());

			pcpu->local_fvtime = pcpu->floor_validate_time;

			pcpu->hispeed_validate_time =

				pcpu->floor_validate_time;

			pcpu->local_hvtime = pcpu->floor_validate_time;