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

Commit 394ec00f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "PM / OPP: Introduce a power estimation helper"

parents 285d3e88 c06419c5

drivers/cpufreq/scmi-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy) 
out_free_priv:

	kfree(priv);

out_free_opp:

	dev_pm_opp_cpumask_remove_table(policy->cpus);

	dev_pm_opp_remove_all_dynamic(cpu_dev);



	return ret;

}
@@ -222,7 +222,7 @@ static int scmi_cpufreq_exit(struct cpufreq_policy *policy) 
	cpufreq_cooling_unregister(priv->cdev);

	dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);

	kfree(priv);

	dev_pm_opp_cpumask_remove_table(policy->related_cpus);

	dev_pm_opp_remove_all_dynamic(priv->cpu_dev);



	return 0;

}

drivers/cpufreq/scpi-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int scpi_cpufreq_init(struct cpufreq_policy *policy) 
out_free_priv:

	kfree(priv);

out_free_opp:

	dev_pm_opp_cpumask_remove_table(policy->cpus);

	dev_pm_opp_remove_all_dynamic(cpu_dev);



	return ret;

}
@@ -196,7 +196,7 @@ static int scpi_cpufreq_exit(struct cpufreq_policy *policy) 
	clk_put(priv->clk);

	dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);

	kfree(priv);

	dev_pm_opp_cpumask_remove_table(policy->related_cpus);

	dev_pm_opp_remove_all_dynamic(priv->cpu_dev);



	return 0;

}

drivers/opp/core.c

+58 −5
Original line number Diff line number Diff line
@@ -881,11 +881,9 @@ void _opp_free(struct dev_pm_opp *opp) 
	kfree(opp);

}



static void _opp_kref_release(struct kref *kref)

static void _opp_kref_release(struct dev_pm_opp *opp,

			      struct opp_table *opp_table)

{

	struct dev_pm_opp *opp = container_of(kref, struct dev_pm_opp, kref);

	struct opp_table *opp_table = opp->opp_table;



	/*

	 * Notify the changes in the availability of the operable

	 * frequency/voltage list.
@@ -894,7 +892,22 @@ static void _opp_kref_release(struct kref *kref) 
	opp_debug_remove_one(opp);

	list_del(&opp->node);

	kfree(opp);

}



static void _opp_kref_release_unlocked(struct kref *kref)

{

	struct dev_pm_opp *opp = container_of(kref, struct dev_pm_opp, kref);

	struct opp_table *opp_table = opp->opp_table;



	_opp_kref_release(opp, opp_table);

}



static void _opp_kref_release_locked(struct kref *kref)

{

	struct dev_pm_opp *opp = container_of(kref, struct dev_pm_opp, kref);

	struct opp_table *opp_table = opp->opp_table;



	_opp_kref_release(opp, opp_table);

	mutex_unlock(&opp_table->lock);

	dev_pm_opp_put_opp_table(opp_table);

}
@@ -906,10 +919,16 @@ void dev_pm_opp_get(struct dev_pm_opp *opp) 


void dev_pm_opp_put(struct dev_pm_opp *opp)

{

	kref_put_mutex(&opp->kref, _opp_kref_release, &opp->opp_table->lock);

	kref_put_mutex(&opp->kref, _opp_kref_release_locked,

		       &opp->opp_table->lock);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_put);



static void dev_pm_opp_put_unlocked(struct dev_pm_opp *opp)

{

	kref_put(&opp->kref, _opp_kref_release_unlocked);

}



/**

 * dev_pm_opp_remove()  - Remove an OPP from OPP table

 * @dev:	device for which we do this operation
@@ -949,6 +968,40 @@ void dev_pm_opp_remove(struct device *dev, unsigned long freq) 
}

EXPORT_SYMBOL_GPL(dev_pm_opp_remove);



/**

 * dev_pm_opp_remove_all_dynamic() - Remove all dynamically created OPPs

 * @dev:	device for which we do this operation

 *

 * This function removes all dynamically created OPPs from the opp table.

 */

void dev_pm_opp_remove_all_dynamic(struct device *dev)

{

	struct opp_table *opp_table;

	struct dev_pm_opp *opp, *temp;

	int count = 0;



	opp_table = _find_opp_table(dev);

	if (IS_ERR(opp_table))

		return;



	mutex_lock(&opp_table->lock);

	list_for_each_entry_safe(opp, temp, &opp_table->opp_list, node) {

		if (opp->dynamic) {

			dev_pm_opp_put_unlocked(opp);

			count++;

		}

	}

	mutex_unlock(&opp_table->lock);



	/* Drop the references taken by dev_pm_opp_add() */

	while (count--)

		dev_pm_opp_put_opp_table(opp_table);



	/* Drop the reference taken by _find_opp_table() */

	dev_pm_opp_put_opp_table(opp_table);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_remove_all_dynamic);



struct dev_pm_opp *_opp_allocate(struct opp_table *table)

{

	struct dev_pm_opp *opp;

drivers/opp/of.c

+99 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/pm_domain.h>

#include <linux/slab.h>

#include <linux/export.h>

#include <linux/energy_model.h>



#include "opp.h"
@@ -838,3 +839,101 @@ int of_dev_pm_opp_get_cpu_power(unsigned long *mW, unsigned long *KHz, int cpu) 
	return 0;

}

EXPORT_SYMBOL_GPL(of_dev_pm_opp_get_cpu_power);



/*

 * Callback function provided to the Energy Model framework upon registration.

 * This computes the power estimated by @CPU at @kHz if it is the frequency

 * of an existing OPP, or at the frequency of the first OPP above @kHz otherwise

 * (see dev_pm_opp_find_freq_ceil()). This function updates @kHz to the ceiled

 * frequency and @mW to the associated power. The power is estimated as

 * P = C * V^2 * f with C being the CPU's capacitance and V and f respectively

 * the voltage and frequency of the OPP.

 *

 * Returns -ENODEV if the CPU device cannot be found, -EINVAL if the power

 * calculation failed because of missing parameters, 0 otherwise.

 */

static int __maybe_unused _get_cpu_power(unsigned long *mW, unsigned long *kHz,

					 int cpu)

{

	struct device *cpu_dev;

	struct dev_pm_opp *opp;

	struct device_node *np;

	unsigned long mV, Hz;

	u32 cap;

	u64 tmp;

	int ret;



	cpu_dev = get_cpu_device(cpu);

	if (!cpu_dev)

		return -ENODEV;



	np = of_node_get(cpu_dev->of_node);

	if (!np)

		return -EINVAL;



	ret = of_property_read_u32(np, "dynamic-power-coefficient", &cap);

	of_node_put(np);

	if (ret)

		return -EINVAL;



	Hz = *kHz * 1000;

	opp = dev_pm_opp_find_freq_ceil(cpu_dev, &Hz);

	if (IS_ERR(opp))

		return -EINVAL;



	mV = dev_pm_opp_get_voltage(opp) / 1000;

	dev_pm_opp_put(opp);

	if (!mV)

		return -EINVAL;



	tmp = (u64)cap * mV * mV * (Hz / 1000000);

	do_div(tmp, 1000000000);



	*mW = (unsigned long)tmp;

	*kHz = Hz / 1000;



	return 0;

}



/**

 * dev_pm_opp_of_register_em() - Attempt to register an Energy Model

 * @cpus	: CPUs for which an Energy Model has to be registered

 *

 * This checks whether the "dynamic-power-coefficient" devicetree property has

 * been specified, and tries to register an Energy Model with it if it has.

 */

void dev_pm_opp_of_register_em(struct cpumask *cpus)

{

	struct em_data_callback em_cb = EM_DATA_CB(_get_cpu_power);

	int ret, nr_opp, cpu = cpumask_first(cpus);

	struct device *cpu_dev;

	struct device_node *np;

	u32 cap;



	cpu_dev = get_cpu_device(cpu);

	if (!cpu_dev)

		return;



	nr_opp = dev_pm_opp_get_opp_count(cpu_dev);

	if (nr_opp <= 0)

		return;



	np = of_node_get(cpu_dev->of_node);

	if (!np)

		return;



	/*

	 * Register an EM only if the 'dynamic-power-coefficient' property is

	 * set in devicetree. It is assumed the voltage values are known if that

	 * property is set since it is useless otherwise. If voltages are not

	 * known, just let the EM registration fail with an error to alert the

	 * user about the inconsistent configuration.

	 */

	ret = of_property_read_u32(np, "dynamic-power-coefficient", &cap);

	of_node_put(np);

	if (ret || !cap)

		return;



	em_register_perf_domain(cpus, nr_opp, &em_cb);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_of_register_em);

include/linux/pm_opp.h

+11 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ void dev_pm_opp_put(struct dev_pm_opp *opp); 
int dev_pm_opp_add(struct device *dev, unsigned long freq,

		   unsigned long u_volt);

void dev_pm_opp_remove(struct device *dev, unsigned long freq);

void dev_pm_opp_remove_all_dynamic(struct device *dev);



int dev_pm_opp_enable(struct device *dev, unsigned long freq);
@@ -208,6 +209,10 @@ static inline void dev_pm_opp_remove(struct device *dev, unsigned long freq) 
{

}



static inline void dev_pm_opp_remove_all_dynamic(struct device *dev)

{

}



static inline int dev_pm_opp_enable(struct device *dev, unsigned long freq)

{

	return 0;
@@ -302,6 +307,7 @@ struct device_node *dev_pm_opp_of_get_opp_desc_node(struct device *dev); 
struct dev_pm_opp *of_dev_pm_opp_find_required_opp(struct device *dev, struct device_node *np);

struct device_node *dev_pm_opp_get_of_node(struct dev_pm_opp *opp);

int of_dev_pm_opp_get_cpu_power(unsigned long *mW, unsigned long *KHz, int cpu);

void dev_pm_opp_of_register_em(struct cpumask *cpus);

#else

static inline int dev_pm_opp_of_add_table(struct device *dev)

{
@@ -344,6 +350,11 @@ static inline struct device_node *dev_pm_opp_get_of_node(struct dev_pm_opp *opp) 
{

	return NULL;

}



static inline void dev_pm_opp_of_register_em(struct cpumask *cpus)

{

}



static inline int of_dev_pm_opp_get_cpu_power(unsigned long *mW, unsigned long *KHz, int cpu)

{

	return -ENOTSUPP;