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

Commit 488b46c4 authored by Archana Sathyakumar's avatar Archana Sathyakumar
Browse files

msm-core: Read frequencies from cpufreq driver 



OPP interface provides many more frequencies than those available for
the cpus. We generate power numbers for more frequencies than we need,
and provide these to the scheduler. While this works, it is not required
to save information of unavailable frequencies.

Read the available frequencies from cpufreq driver and calculate power
numbers only for these frequencies.

Change-Id: I6b379531704c62f7d84e743bcffc237cdc334f58
Signed-off-by: default avatarArchana Sathyakumar <asathyak@codeaurora.org>
parent 408d933c

drivers/power/qcom/msm-core.c

+65 −10
Original line number Diff line number Diff line
@@ -553,16 +553,12 @@ static int msm_core_dyn_pwr_init(struct platform_device *pdev, 
	int i;

	struct platform_device *pdev_rail;



	activity[cpu].sp = kzalloc(sizeof(*(activity[cpu].sp)), GFP_KERNEL);

	if (!activity[cpu].sp)

		return -ENOMEM;



	pdev_rail = of_find_device_by_node(activity[cpu].apc_node);

	ret = dev_pm_opp_init_cpufreq_table(&pdev_rail->dev,

			&activity[cpu].sp->table);

	if (ret) {

		pr_err("Couldn't init freq table for cpu%d: %d\n", cpu, ret);

		return ret;



	/* OOPS, we shoud not be here. There is something wrong */

	if (!activity[cpu].sp->table) {

		pr_err("Frequency table for cpu%d not found\n", cpu);

		return -EINVAL;

	}



	for (i = 0; activity[cpu].sp->table[i].frequency != CPUFREQ_TABLE_END;
@@ -661,6 +657,57 @@ static int msm_core_mpidr_init(struct device_node *node) 
	return mpidr;

}



static int msm_core_freq_init(void)

{

	struct cpufreq_policy *policy;

	struct cpufreq_frequency_table *table;

	int idx = 0;

	int cpu, i;



	for_each_possible_cpu(cpu) {

		activity[cpu].sp = kzalloc(sizeof(*(activity[cpu].sp)),

				GFP_KERNEL);

		if (!activity[cpu].sp)

			return -ENOMEM;

	}



	for_each_possible_cpu(cpu) {

		if (activity[cpu].sp->table)

			continue;



		policy = cpufreq_cpu_get(cpu);

		if (!policy)

			continue;



		table = cpufreq_frequency_get_table(policy->cpu);

		if (!table) {

			pr_err("Couldn't get freq table for cpu%d\n",

					policy->cpu);

			return -EINVAL;

		}



		/*

		 * Synchronous cores within cluster have the same

		 * policy. Since these cores do not have the cpufreq

		 * table initialized for all of them, copy the same

		 * table to all the related cpus.

		 */

		for_each_cpu(i, policy->related_cpus) {

			activity[i].sp->table = table;

			idx++;

		}



		cpufreq_cpu_put(policy);

	}



	/* Make sure we filled in the frequency table for all the cpus*/

	if (idx != num_possible_cpus()) {

		pr_err("Freq table for all cpus are not initialized\n");

		return -EINVAL;

	}

	return 0;

}



static int msm_core_params_init(struct platform_device *pdev)

{

	int ret = 0;
@@ -734,9 +781,13 @@ static void free_dyn_memory(void) 


	for_each_possible_cpu(cpu) {

		if (activity[cpu].sp) {

			for (i = 0; i < TEMP_DATA_POINTS; i++)

			for (i = 0; i < TEMP_DATA_POINTS; i++) {

				if (!activity[cpu].sp->power)

					break;



				kfree(activity[cpu].sp->power[i]);

			}

		}

		kfree(activity[cpu].sp);

	}

}
@@ -770,6 +821,10 @@ static int msm_core_dev_probe(struct platform_device *pdev) 
	if (ret)

		pr_info("msm-core initialized without polling period\n");



	ret = msm_core_freq_init();

	if (ret)

		return ret;



	ret = misc_register(&msm_core_device);

	if (ret) {

		pr_err("%s: Error registering device %d\n", __func__, ret);