BACKPORT: devfreq_cooling: pass a pointer to devfreq in the power model callbacks

When the devfreq cooling device was designed, it was an oversight not to
pass a pointer to the struct devfreq as the first parameters of the
callbacks.  The design patterns of the kernel suggest it for a good
reason.

By passing a pointer to struct devfreq, the driver can register one
function that works with multiple devices.  With the current
implementation, a driver that can work with multiple devices has to
create multiple copies of the same function with different parameters so
that each devfreq_cooling_device can use the appropriate one.  By
passing a pointer to struct devfreq, the driver can identify which
device it's referring to.

Change-Id: I384bf9aafd2391eccab2ca6a76e4e57f2740aa6b
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Reviewed-by: Punit Agrawal <punit.agrawal@arm.com>
Reviewed-by: Ørjan Eide <orjan.eide@arm.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 3aa5374376)
This commit is contained in:
Javi Merino 2016-09-15 15:44:23 +01:00 committed by Tao Huang
parent ece9e5b002
commit 5dcb4226bb
8 changed files with 31 additions and 16 deletions

View File

@ -2225,7 +2225,8 @@ static struct devfreq_governor devfreq_dmc_ondemand = {
.event_handler = devfreq_dmc_ondemand_handler,
};
static unsigned long model_static_power(unsigned long voltage)
static unsigned long model_static_power(struct devfreq *devfreq,
unsigned long voltage)
{
struct rockchip_dmcfreq *dmcfreq = rk_dmcfreq;
struct device *dev = dmcfreq->dev;
@ -2267,7 +2268,8 @@ static unsigned long model_static_power(unsigned long voltage)
* temp_scaling_factor) / 1000000;
}
static unsigned long model_dynamic_power(unsigned long freq,
static unsigned long model_dynamic_power(struct devfreq *devfreq,
unsigned long freq,
unsigned long voltage)
{
/*

View File

@ -183,7 +183,8 @@ static struct resource mali_gpu_resources_m400_mp2[] = {
static struct thermal_zone_device *gpu_tz;
/* Calculate gpu static power example for reference */
static unsigned long arm_model_static_power(unsigned long voltage)
static unsigned long arm_model_static_power(struct devfreq *devfreq,
unsigned long voltage)
{
int temperature, temp;
int temp_squared, temp_cubed, temp_scaling_factor;
@ -223,7 +224,8 @@ static unsigned long arm_model_static_power(unsigned long voltage)
}
/* Calculate gpu dynamic power example for reference */
static unsigned long arm_model_dynamic_power(unsigned long freq,
static unsigned long arm_model_dynamic_power(struct devfreq *devfreq,
unsigned long freq,
unsigned long voltage)
{
/* The inputs: freq (f) is in Hz, and voltage (v) in mV.

View File

@ -301,7 +301,8 @@ static int power_model_simple_init(struct platform_device *pdev)
}
/* Calculate gpu static power example for reference */
static unsigned long rk_model_static_power(unsigned long voltage)
static unsigned long rk_model_static_power(struct devfreq *devfreq,
unsigned long voltage)
{
int temperature, temp;
int temp_squared, temp_cubed, temp_scaling_factor;
@ -340,7 +341,8 @@ static unsigned long rk_model_static_power(unsigned long voltage)
}
/* Calculate gpu dynamic power example for reference */
static unsigned long rk_model_dynamic_power(unsigned long freq,
static unsigned long rk_model_dynamic_power(struct devfreq *devfreq,
unsigned long freq,
unsigned long voltage)
{
/* The inputs: freq (f) is in Hz, and voltage (v) in mV.

View File

@ -34,7 +34,8 @@ static u32 static_coefficient;
static s32 ts[4];
static struct thermal_zone_device *gpu_tz;
static unsigned long model_static_power(unsigned long voltage)
static unsigned long model_static_power(struct devfreq *devfreq,
unsigned long voltage)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
unsigned long temperature;
@ -75,7 +76,8 @@ static unsigned long model_static_power(unsigned long voltage)
/ 1000000;
}
static unsigned long model_dynamic_power(unsigned long freq,
static unsigned long model_dynamic_power(struct devfreq *devfreq,
unsigned long freq,
unsigned long voltage)
{
/* The inputs: freq (f) is in Hz, and voltage (v) in mV.

View File

@ -34,7 +34,8 @@ static u32 static_coefficient;
static s32 ts[4];
static struct thermal_zone_device *gpu_tz;
static unsigned long model_static_power(unsigned long voltage)
static unsigned long model_static_power(struct devfreq *devfreq,
unsigned long voltage)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
unsigned long temperature;
@ -75,7 +76,8 @@ static unsigned long model_static_power(unsigned long voltage)
/ 1000000;
}
static unsigned long model_dynamic_power(unsigned long freq,
static unsigned long model_dynamic_power(struct devfreq *devfreq,
unsigned long freq,
unsigned long voltage)
{
/* The inputs: freq (f) is in Hz, and voltage (v) in mV.

View File

@ -436,7 +436,8 @@ static u32 static_coefficient;
static s32 ts[4];
static struct thermal_zone_device *gpu_tz;
static unsigned long model_static_power(unsigned long voltage)
static unsigned long model_static_power(struct devfreq *devfreq,
unsigned long voltage)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
unsigned long temperature;
@ -477,7 +478,8 @@ static unsigned long model_static_power(unsigned long voltage)
/ 1000000;
}
static unsigned long model_dynamic_power(unsigned long freq,
static unsigned long model_dynamic_power(struct devfreq *devfreq,
unsigned long freq,
unsigned long voltage)
{
/* The inputs: freq (f) is in Hz, and voltage (v) in mV.

View File

@ -238,7 +238,7 @@ get_static_power(struct devfreq_cooling_device *dfc, unsigned long freq)
return 0;
}
return dfc->power_ops->get_static_power(voltage);
return dfc->power_ops->get_static_power(df, voltage);
}
/**
@ -262,7 +262,8 @@ get_dynamic_power(struct devfreq_cooling_device *dfc, unsigned long freq,
struct devfreq_cooling_power *dfc_power = dfc->power_ops;
if (dfc_power->get_dynamic_power)
return dfc_power->get_dynamic_power(freq, voltage);
return dfc_power->get_dynamic_power(dfc->devfreq, freq,
voltage);
freq_mhz = freq / 1000000;
power = (u64)dfc_power->dyn_power_coeff * freq_mhz * voltage * voltage;

View File

@ -37,8 +37,10 @@
* @dyn_power_coeff * frequency * voltage^2
*/
struct devfreq_cooling_power {
unsigned long (*get_static_power)(unsigned long voltage);
unsigned long (*get_dynamic_power)(unsigned long freq,
unsigned long (*get_static_power)(struct devfreq *devfreq,
unsigned long voltage);
unsigned long (*get_dynamic_power)(struct devfreq *devfreq,
unsigned long freq,
unsigned long voltage);
unsigned long dyn_power_coeff;
};