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

Commit 2c93104f authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

PM / OPP: Relocate dev_pm_opp_set_sharing_cpus() 



Move dev_pm_opp_set_sharing_cpus() towards the end of the file. This
is required for better readability after the next patch is applied,
which adds dev_pm_opp_get_sharing_cpus().

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 642aa8ce

drivers/base/power/opp/cpu.c

+56 −56
Original line number Diff line number Diff line
@@ -119,62 +119,6 @@ void dev_pm_opp_free_cpufreq_table(struct device *dev, 
EXPORT_SYMBOL_GPL(dev_pm_opp_free_cpufreq_table);

#endif	/* CONFIG_CPU_FREQ */



/**

 * dev_pm_opp_set_sharing_cpus() - Mark OPP table as shared by few CPUs

 * @cpu_dev:	CPU device for which we do this operation

 * @cpumask:	cpumask of the CPUs which share the OPP table with @cpu_dev

 *

 * This marks OPP table of the @cpu_dev as shared by the CPUs present in

 * @cpumask.

 *

 * Returns -ENODEV if OPP table isn't already present.

 *

 * Locking: The internal opp_table and opp structures are RCU protected.

 * Hence this function internally uses RCU updater strategy with mutex locks

 * to keep the integrity of the internal data structures. Callers should ensure

 * that this function is *NOT* called under RCU protection or in contexts where

 * mutex cannot be locked.

 */

int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask)

{

	struct opp_device *opp_dev;

	struct opp_table *opp_table;

	struct device *dev;

	int cpu, ret = 0;



	mutex_lock(&opp_table_lock);



	opp_table = _find_opp_table(cpu_dev);

	if (IS_ERR(opp_table)) {

		ret = PTR_ERR(opp_table);

		goto unlock;

	}



	for_each_cpu(cpu, cpumask) {

		if (cpu == cpu_dev->id)

			continue;



		dev = get_cpu_device(cpu);

		if (!dev) {

			dev_err(cpu_dev, "%s: failed to get cpu%d device\n",

				__func__, cpu);

			continue;

		}



		opp_dev = _add_opp_dev(dev, opp_table);

		if (!opp_dev) {

			dev_err(dev, "%s: failed to add opp-dev for cpu%d device\n",

				__func__, cpu);

			continue;

		}

	}

unlock:

	mutex_unlock(&opp_table_lock);



	return ret;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_set_sharing_cpus);



#ifdef CONFIG_OF

/**

 * dev_pm_opp_of_cpumask_remove_table() - Removes OPP table for @cpumask
@@ -326,3 +270,59 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask 
}

EXPORT_SYMBOL_GPL(dev_pm_opp_of_get_sharing_cpus);

#endif



/**

 * dev_pm_opp_set_sharing_cpus() - Mark OPP table as shared by few CPUs

 * @cpu_dev:	CPU device for which we do this operation

 * @cpumask:	cpumask of the CPUs which share the OPP table with @cpu_dev

 *

 * This marks OPP table of the @cpu_dev as shared by the CPUs present in

 * @cpumask.

 *

 * Returns -ENODEV if OPP table isn't already present.

 *

 * Locking: The internal opp_table and opp structures are RCU protected.

 * Hence this function internally uses RCU updater strategy with mutex locks

 * to keep the integrity of the internal data structures. Callers should ensure

 * that this function is *NOT* called under RCU protection or in contexts where

 * mutex cannot be locked.

 */

int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask)

{

	struct opp_device *opp_dev;

	struct opp_table *opp_table;

	struct device *dev;

	int cpu, ret = 0;



	mutex_lock(&opp_table_lock);



	opp_table = _find_opp_table(cpu_dev);

	if (IS_ERR(opp_table)) {

		ret = PTR_ERR(opp_table);

		goto unlock;

	}



	for_each_cpu(cpu, cpumask) {

		if (cpu == cpu_dev->id)

			continue;



		dev = get_cpu_device(cpu);

		if (!dev) {

			dev_err(cpu_dev, "%s: failed to get cpu%d device\n",

				__func__, cpu);

			continue;

		}



		opp_dev = _add_opp_dev(dev, opp_table);

		if (!opp_dev) {

			dev_err(dev, "%s: failed to add opp-dev for cpu%d device\n",

				__func__, cpu);

			continue;

		}

	}

unlock:

	mutex_unlock(&opp_table_lock);



	return ret;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_set_sharing_cpus);