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: 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>

diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c
index 81631b110e178f3b186746f32c8a8f4c001c0046..5a737fd5f1aa470104406ccfafbd3e50d03b9a03 100644 (file)
--- a/drivers/thermal/devfreq_cooling.c
+++ b/drivers/thermal/devfreq_cooling.c
@@ -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;

diff --git a/include/linux/devfreq_cooling.h b/include/linux/devfreq_cooling.h
index 3049f9422507c9000b8f0fed72a54b1c2dfeb501..c35d0c0e0ada7a4e99363d217a86fc4cad8dafaf 100644 (file)
--- a/include/linux/devfreq_cooling.h
+++ b/include/linux/devfreq_cooling.h
@@ -36,8 +36,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;
 };