Commit 3aa53743 authored by Javi Merino's avatar Javi Merino Committed by Zhang Rui

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.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Reviewed-by: default avatarPunit Agrawal <punit.agrawal@arm.com>
Reviewed-by: default avatarØrjan Eide <orjan.eide@arm.com>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Signed-off-by: default avatarJavi Merino <javi.merino@arm.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 1cea4e77
...@@ -238,7 +238,7 @@ get_static_power(struct devfreq_cooling_device *dfc, unsigned long freq) ...@@ -238,7 +238,7 @@ get_static_power(struct devfreq_cooling_device *dfc, unsigned long freq)
return 0; 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, ...@@ -262,7 +262,8 @@ get_dynamic_power(struct devfreq_cooling_device *dfc, unsigned long freq,
struct devfreq_cooling_power *dfc_power = dfc->power_ops; struct devfreq_cooling_power *dfc_power = dfc->power_ops;
if (dfc_power->get_dynamic_power) 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; freq_mhz = freq / 1000000;
power = (u64)dfc_power->dyn_power_coeff * freq_mhz * voltage * voltage; power = (u64)dfc_power->dyn_power_coeff * freq_mhz * voltage * voltage;
......
...@@ -36,8 +36,10 @@ ...@@ -36,8 +36,10 @@
* @dyn_power_coeff * frequency * voltage^2 * @dyn_power_coeff * frequency * voltage^2
*/ */
struct devfreq_cooling_power { struct devfreq_cooling_power {
unsigned long (*get_static_power)(unsigned long voltage); unsigned long (*get_static_power)(struct devfreq *devfreq,
unsigned long (*get_dynamic_power)(unsigned long freq, unsigned long voltage);
unsigned long (*get_dynamic_power)(struct devfreq *devfreq,
unsigned long freq,
unsigned long voltage); unsigned long voltage);
unsigned long dyn_power_coeff; unsigned long dyn_power_coeff;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment