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

Commit 655296ea authored by Viresh Kumar's avatar Viresh Kumar Committed by Alex Shi
Browse files

cpufreq: arm_big_little: free OPP table created during ->init() 



OPP layer now supports freeing of OPPs and we should free them once they aren't
useful anymore.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 493b4cd285e68d8d8d5853a2536ea06f8cabeaeb)
Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent 05cb54e6

drivers/cpufreq/arm_big_little.c

+6 −1
Original line number Diff line number Diff line
@@ -289,6 +289,8 @@ static void _put_cluster_clk_and_freq_table(struct device *cpu_dev) 


	clk_put(clk[cluster]);

	dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table[cluster]);

	if (arm_bL_ops->free_opp_table)

		arm_bL_ops->free_opp_table(cpu_dev);

	dev_dbg(cpu_dev, "%s: cluster: %d\n", __func__, cluster);

}
@@ -337,7 +339,7 @@ static int _get_cluster_clk_and_freq_table(struct device *cpu_dev) 
	if (ret) {

		dev_err(cpu_dev, "%s: failed to init cpufreq table, cpu: %d, err: %d\n",

				__func__, cpu_dev->id, ret);

		goto out;

		goto free_opp_table;

	}



	name[12] = cluster + '0';
@@ -354,6 +356,9 @@ static int _get_cluster_clk_and_freq_table(struct device *cpu_dev) 
	ret = PTR_ERR(clk[cluster]);

	dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table[cluster]);



free_opp_table:

	if (arm_bL_ops->free_opp_table)

		arm_bL_ops->free_opp_table(cpu_dev);

out:

	dev_err(cpu_dev, "%s: Failed to get data for cluster: %d\n", __func__,

			cluster);

drivers/cpufreq/arm_big_little.h

+4 −1
Original line number Diff line number Diff line
@@ -25,13 +25,16 @@ 


struct cpufreq_arm_bL_ops {

	char name[CPUFREQ_NAME_LEN];

	int (*get_transition_latency)(struct device *cpu_dev);



	/*

	 * This must set opp table for cpu_dev in a similar way as done by

	 * of_init_opp_table().

	 */

	int (*init_opp_table)(struct device *cpu_dev);



	/* Optional */

	int (*get_transition_latency)(struct device *cpu_dev);

	void (*free_opp_table)(struct device *cpu_dev);

};



int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops);

drivers/cpufreq/arm_big_little_dt.c

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static struct cpufreq_arm_bL_ops dt_bL_ops = { 
	.name	= "dt-bl",

	.get_transition_latency = dt_get_transition_latency,

	.init_opp_table = dt_init_opp_table,

	.free_opp_table = of_free_opp_table,

};



static int generic_bL_probe(struct platform_device *pdev)