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

Commit fdfdc36e authored by Junjie Wu's avatar Junjie Wu Committed by Matt Wagantall
Browse files

cpufreq: Save and restore user min/max freq for hotplug 



In addition to restoring the previous governor after hotplug, restore
min/max frequency set in user_policy.

This patch combines commit:
1) 026cf76c5a2b1b84cbe12b79800f97389abfd589 (android-msm-2.6.35)
   cpufreq: Save and restore min and max frequencies
2) 82a8db17421e475eb662ad83674d4f7a351bc55e (msm-3.4)
   cpufreq: Save user policy min/max instead of policy min/max during
   hotplug

Refactor it to cleanly apply to 3.18.

Change-Id: Id097132765a5487618ca020bae3cc9c9ea791072
Signed-off-by: default avatarJunjie Wu <junjiew@codeaurora.org>
parent f9800798

drivers/cpufreq/cpufreq.c

+31 −7
Original line number Diff line number Diff line
@@ -42,12 +42,19 @@ static DEFINE_RWLOCK(cpufreq_driver_lock); 
DEFINE_MUTEX(cpufreq_governor_lock);

static LIST_HEAD(cpufreq_policy_list);



/* This one keeps track of the previously set governor of a removed CPU */

static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor);



/* Flag to suspend/resume CPUFreq governors */

static bool cpufreq_suspended;



/*

 * This one keeps track of the previously set governor and user-set

 * min/max freq of a removed CPU

 */

struct cpufreq_cpu_save_data {

	char gov[CPUFREQ_NAME_LEN];

	unsigned int max, min;

};

static DEFINE_PER_CPU(struct cpufreq_cpu_save_data, cpufreq_policy_save);



static inline bool has_target(void)

{

	return cpufreq_driver->target_index || cpufreq_driver->target;
@@ -960,7 +967,7 @@ static void cpufreq_init_policy(struct cpufreq_policy *policy) 
	memcpy(&new_policy, policy, sizeof(*policy));



	/* Update governor of new_policy to the governor used before hotplug */

	gov = __find_governor(per_cpu(cpufreq_cpu_governor, policy->cpu));

	gov = __find_governor(per_cpu(cpufreq_policy_save, policy->cpu).gov);

	if (gov)

		pr_debug("Restoring governor %s for cpu %d\n",

				policy->governor->name, policy->cpu);
@@ -969,6 +976,17 @@ static void cpufreq_init_policy(struct cpufreq_policy *policy) 


	new_policy.governor = gov;



	if (per_cpu(cpufreq_policy_save, policy->cpu).min) {

		policy->min = per_cpu(cpufreq_policy_save, policy->cpu).min;

		policy->user_policy.min = policy->min;

	}

	if (per_cpu(cpufreq_policy_save, policy->cpu).max) {

		policy->max = per_cpu(cpufreq_policy_save, policy->cpu).max;

		policy->user_policy.max = policy->max;

	}

	pr_debug("Restoring CPU%d user policy min %d and max %d\n",

		 policy->cpu, policy->min, policy->max);



	/* Use the default policy if its valid. */

	if (cpufreq_driver->setpolicy)

		cpufreq_parse_governor(gov->name, &new_policy.policy, NULL);
@@ -1378,8 +1396,12 @@ static int __cpufreq_remove_dev_prepare(struct device *dev, 
	}



	if (!cpufreq_driver->setpolicy)

		strncpy(per_cpu(cpufreq_cpu_governor, cpu),

		strlcpy(per_cpu(cpufreq_policy_save, cpu).gov,

			policy->governor->name, CPUFREQ_NAME_LEN);

	per_cpu(cpufreq_policy_save, cpu).min = policy->user_policy.min;

	per_cpu(cpufreq_policy_save, cpu).max = policy->user_policy.max;

	pr_debug("Saving CPU%d user policy min %d and max %d\n",

		 cpu, policy->user_policy.min, policy->user_policy.max);



	down_read(&policy->rwsem);

	cpus = cpumask_weight(policy->cpus);
@@ -2118,6 +2140,7 @@ EXPORT_SYMBOL_GPL(cpufreq_register_governor); 
void cpufreq_unregister_governor(struct cpufreq_governor *governor)

{

	int cpu;

	struct cpufreq_cpu_save_data *saved_policy;



	if (!governor)

		return;
@@ -2128,8 +2151,9 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor) 
	for_each_present_cpu(cpu) {

		if (cpu_online(cpu))

			continue;

		if (!strcmp(per_cpu(cpufreq_cpu_governor, cpu), governor->name))

			strcpy(per_cpu(cpufreq_cpu_governor, cpu), "\0");

		saved_policy = &per_cpu(cpufreq_policy_save, cpu);

		if (!strcmp(saved_policy->gov, governor->name))

			strlcpy(saved_policy->gov, "\0", CPUFREQ_NAME_LEN);

	}



	mutex_lock(&cpufreq_governor_mutex);