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

Commit 7d5d0c8b authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: dt: Check OPP count before marking them shared 



We need to explicitly mark OPPs as shared, when they are not defined
with OPP-v2 bindings. But this isn't required to be done if we failed to
initialize OPP table.

Reorder code to verify OPP count before marking them shared.

Fixes: 2e02d872 ("cpufreq: dt: Add support for operating-points-v2 bindings")
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0ed537b5

drivers/cpufreq/cpufreq-dt.c

+11 −11
Original line number Diff line number Diff line
@@ -239,6 +239,17 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
	 */

	of_cpumask_init_opp_table(policy->cpus);



	/*

	 * But we need OPP table to function so if it is not there let's

	 * give platform code chance to provide it for us.

	 */

	ret = dev_pm_opp_get_opp_count(cpu_dev);

	if (ret <= 0) {

		pr_debug("OPP table is not ready, deferring probe\n");

		ret = -EPROBE_DEFER;

		goto out_free_opp;

	}



	if (need_update) {

		struct cpufreq_dt_platform_data *pd = cpufreq_get_driver_data();
@@ -256,17 +267,6 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
		transition_latency = dev_pm_opp_get_max_clock_latency(cpu_dev);

	}



	/*

	 * But we need OPP table to function so if it is not there let's

	 * give platform code chance to provide it for us.

	 */

	ret = dev_pm_opp_get_opp_count(cpu_dev);

	if (ret <= 0) {

		pr_debug("OPP table is not ready, deferring probe\n");

		ret = -EPROBE_DEFER;

		goto out_free_opp;

	}



	priv = kzalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv) {

		ret = -ENOMEM;