LinuxLists.cc - [PATCH 0/4] Update Energy Model after chip binning adjusted voltages

2024-03-14 14:04:58

Subject: [PATCH 0/4] Update Energy Model after chip binning adjusted voltages

Hi all,

This is a follow-up patch aiming to add EM modification due to chip binning.
The first RFC and the discussion can be found here [1].

It uses Exynos chip driver code as a 1st user. The EM framework has been
extended to handle this use case easily, when the voltage has been changed
after setup. On my Odroid-xu4 in some OPPs I can observe ~20% power difference.
According to that data in driver tables it could be up to ~29%.

This chip binning is applicable to a lot of SoCs, so the EM framework should
make it easy to update. It uses the existing OPP and DT information to
re-calculate the new power values.

Changes:
v2:
- exported the OPP calculation function from the OPP/OF so it can be
used from EM fwk (Viresh)
- refactored EM updating function to re-use common code
- added new EM function which can be used by chip device drivers which
modify the voltage in OPPs
v1 is at [1]

Regards,
Lukasz Luba

[1] https://lore.kernel.org/lkml/[email protected]/

Lukasz Luba (4):
OPP: OF: Export dev_opp_pm_calc_power() for usage from EM
PM: EM: Change the em_adjust_new_capacity() to re-use code
PM: EM: Add em_dev_update_chip_binning()
soc: samsung: exynos-asv: Update Energy Model after adjusting voltage

drivers/opp/of.c | 17 +++--
drivers/soc/samsung/exynos-asv.c | 11 +++-
include/linux/energy_model.h | 5 ++
include/linux/pm_opp.h | 8 +++
kernel/power/energy_model.c | 109 +++++++++++++++++++++++++------
5 files changed, 125 insertions(+), 25 deletions(-)

--
2.25.1

2024-03-14 14:06:07

by Lukasz Luba

[permalink] [raw]

Subject: [PATCH 2/4] PM: EM: Change the em_adjust_new_capacity() to re-use code

There is going to be a new update function addressing chip binning.
Therefore, some common code which can be refactored and called from
upcoming changes and em_adjust_new_capacity(). In this way the code
duplication can be avoided.

Signed-off-by: Lukasz Luba <[email protected]>
---
kernel/power/energy_model.c | 58 +++++++++++++++++++++++++------------
1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
index 9e1c9aa399ea9..6960dd7393b2d 100644
--- a/kernel/power/energy_model.c
+++ b/kernel/power/energy_model.c
@@ -674,23 +674,15 @@ void em_dev_unregister_perf_domain(struct device *dev)
}
EXPORT_SYMBOL_GPL(em_dev_unregister_perf_domain);

-/*
- * Adjustment of CPU performance values after boot, when all CPUs capacites
- * are correctly calculated.
- */
-static void em_adjust_new_capacity(struct device *dev,
- struct em_perf_domain *pd,
- u64 max_cap)
+static struct em_perf_table __rcu *em_table_dup(struct em_perf_domain *pd)
{
struct em_perf_table __rcu *em_table;
struct em_perf_state *ps, *new_ps;
- int ret, ps_size;
+ int ps_size;

em_table = em_table_alloc(pd);
- if (!em_table) {
- dev_warn(dev, "EM: allocation failed\n");
- return;
- }
+ if (!em_table)
+ return NULL;

new_ps = em_table->state;

@@ -702,24 +694,52 @@ static void em_adjust_new_capacity(struct device *dev,

rcu_read_unlock();

- em_init_performance(dev, pd, new_ps, pd->nr_perf_states);
- ret = em_compute_costs(dev, new_ps, NULL, pd->nr_perf_states,
+ return em_table;
+}
+
+static int em_recalc_and_update(struct device *dev, struct em_perf_domain *pd,
+ struct em_perf_table __rcu *em_table)
+{
+ int ret;
+
+ ret = em_compute_costs(dev, em_table->state, NULL, pd->nr_perf_states,
pd->flags);
- if (ret) {
- dev_warn(dev, "EM: compute costs failed\n");
- return;
- }
+ if (ret)
+ goto free_em_table;

ret = em_dev_update_perf_domain(dev, em_table);
if (ret)
- dev_warn(dev, "EM: update failed %d\n", ret);
+ goto free_em_table;

/*
* This is one-time-update, so give up the ownership in this updater.
* The EM framework has incremented the usage counter and from now
* will keep the reference (then free the memory when needed).
*/
+free_em_table:
em_table_free(em_table);
+ return ret;
+}
+
+/*
+ * Adjustment of CPU performance values after boot, when all CPUs capacites
+ * are correctly calculated.
+ */
+static void em_adjust_new_capacity(struct device *dev,
+ struct em_perf_domain *pd,
+ u64 max_cap)
+{
+ struct em_perf_table __rcu *em_table;
+
+ em_table = em_table_dup(pd);
+ if (!em_table) {
+ dev_warn(dev, "EM: allocation failed\n");
+ return;
+ }
+
+ em_init_performance(dev, pd, em_table->state, pd->nr_perf_states);
+
+ em_recalc_and_update(dev, pd, em_table);
}

static void em_check_capacity_update(void)
--
2.25.1

2024-03-14 14:06:06

by Lukasz Luba

[permalink] [raw]

Subject: [PATCH 4/4] soc: samsung: exynos-asv: Update Energy Model after adjusting voltage

When the voltage for OPPs is adjusted there is a need to also update
Energy Model framework. The EM data contains power values which depend
on voltage values. The EM structure is used for thermal (IPA governor)
and in scheduler task placement (EAS) so it should reflect the real HW
model as best as possible to operate properly.

Based on data on Exynos5422 ASV tables the maximum power difference might
be ~29%. An Odroid-XU4 (with a random sample SoC in this chip lottery)
showed power difference for some OPPs ~20%. Therefore, it's worth to
update the EM.

Signed-off-by: Lukasz Luba <[email protected]>
---
drivers/soc/samsung/exynos-asv.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/samsung/exynos-asv.c b/drivers/soc/samsung/exynos-asv.c
index d60af8acc3916..bd6bb2cab2cd8 100644
--- a/drivers/soc/samsung/exynos-asv.c
+++ b/drivers/soc/samsung/exynos-asv.c
@@ -11,6 +11,7 @@

#include <linux/cpu.h>
#include <linux/device.h>
+#include <linux/energy_model.h>
#include <linux/errno.h>
#include <linux/of.h>
#include <linux/pm_opp.h>
@@ -97,9 +98,17 @@ static int exynos_asv_update_opps(struct exynos_asv *asv)
last_opp_table = opp_table;

ret = exynos_asv_update_cpu_opps(asv, cpu);
- if (ret < 0)
+ if (!ret) {
+ /*
+ * When the voltage for OPPs successfully
+ * changed, update the EM power values to
+ * reflect the reality and not use stale data
+ */
+ em_dev_update_chip_binning(cpu);
+ } else {
dev_err(asv->dev, "Couldn't udate OPPs for cpu%d\n",
cpuid);
+ }
}

dev_pm_opp_put_opp_table(opp_table);
--
2.25.1

2024-03-14 14:08:49

by Lukasz Luba

[permalink] [raw]

Subject: [PATCH 1/4] OPP: OF: Export dev_opp_pm_calc_power() for usage from EM

There are device drivers which can modify voltage values for OPPs. It
could be due to the chip binning and those drivers have specific chip
knowledge about it. This adjustment can happen after Energy Model is
registered, thus EM can have stale data about power.

Export dev_opp_pm_calc_power() which can be used by Energy Model to
calculate new power with the new voltage for OPPs.

Signed-off-by: Lukasz Luba <[email protected]>
---
drivers/opp/of.c | 17 ++++++++++++-----
include/linux/pm_opp.h | 8 ++++++++
2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/drivers/opp/of.c b/drivers/opp/of.c
index f9f0b22bccbb4..282eb5966fd03 100644
--- a/drivers/opp/of.c
+++ b/drivers/opp/of.c
@@ -1494,20 +1494,26 @@ _get_dt_power(struct device *dev, unsigned long *uW, unsigned long *kHz)
return 0;
}

-/*
- * Callback function provided to the Energy Model framework upon registration.
+/**
+ * dev_pm_opp_calc_power() - Calculate power value for device with EM
+ * @dev : Device for which an Energy Model has to be registered
+ * @uW : New power value that is calculated
+ * @kHz : Frequency for which the new power is calculated
+ *
* This computes the power estimated by @dev 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 @uW to the associated power. The power is estimated as
* P = C * V^2 * f with C being the device's capacitance and V and f
* respectively the voltage and frequency of the OPP.
+ * It is also used as a callback function provided to the Energy Model
+ * framework upon registration.
*
* Returns -EINVAL if the power calculation failed because of missing
* parameters, 0 otherwise.
*/
-static int __maybe_unused _get_power(struct device *dev, unsigned long *uW,
- unsigned long *kHz)
+int dev_pm_opp_calc_power(struct device *dev, unsigned long *uW,
+ unsigned long *kHz)
{
struct dev_pm_opp *opp;
struct device_node *np;
@@ -1544,6 +1550,7 @@ static int __maybe_unused _get_power(struct device *dev, unsigned long *uW,

return 0;
}
+EXPORT_SYMBOL_GPL(dev_pm_opp_calc_power);

static bool _of_has_opp_microwatt_property(struct device *dev)
{
@@ -1619,7 +1626,7 @@ int dev_pm_opp_of_register_em(struct device *dev, struct cpumask *cpus)
goto failed;
}

- EM_SET_ACTIVE_POWER_CB(em_cb, _get_power);
+ EM_SET_ACTIVE_POWER_CB(em_cb, dev_pm_opp_calc_power);

register_em:
ret = em_dev_register_perf_domain(dev, nr_opp, &em_cb, cpus, true);
diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
index 065a47382302c..31370deb9905f 100644
--- a/include/linux/pm_opp.h
+++ b/include/linux/pm_opp.h
@@ -476,6 +476,8 @@ struct device_node *dev_pm_opp_get_of_node(struct dev_pm_opp *opp);
int of_get_required_opp_performance_state(struct device_node *np, int index);
int dev_pm_opp_of_find_icc_paths(struct device *dev, struct opp_table *opp_table);
int dev_pm_opp_of_register_em(struct device *dev, struct cpumask *cpus);
+int dev_pm_opp_calc_power(struct device *dev, unsigned long *uW,
+ unsigned long *kHz);
static inline void dev_pm_opp_of_unregister_em(struct device *dev)
{
em_dev_unregister_perf_domain(dev);
@@ -539,6 +541,12 @@ static inline void dev_pm_opp_of_unregister_em(struct device *dev)
{
}

+static inline int dev_pm_opp_calc_power(struct device *dev, unsigned long *uW,
+ unsigned long *kHz)
+{
+ return -EOPNOTSUPP;
+}
+
static inline int of_get_required_opp_performance_state(struct device_node *np, int index)
{
return -EOPNOTSUPP;
--
2.25.1

2024-03-14 14:09:37

by Lukasz Luba

[permalink] [raw]

Subject: [PATCH 3/4] PM: EM: Add em_dev_update_chip_binning()

Add a function which allows to modify easily the EM after the new voltage
information is available. The device drivers for the chip can adjust
the voltage values after setup. The voltage for the same frequency in OPP
can be different due to chip binning. The voltage impacts the power usage
and the EM power values can be updated to reflect that.

Signed-off-by: Lukasz Luba <[email protected]>
---
include/linux/energy_model.h | 5 ++++
kernel/power/energy_model.c | 51 ++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+)

diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h
index 770755df852f1..d30d67c2f07cf 100644
--- a/include/linux/energy_model.h
+++ b/include/linux/energy_model.h
@@ -172,6 +172,7 @@ struct em_perf_table __rcu *em_table_alloc(struct em_perf_domain *pd);
void em_table_free(struct em_perf_table __rcu *table);
int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,
int nr_states);
+int em_dev_update_chip_binning(struct device *dev);

/**
* em_pd_get_efficient_state() - Get an efficient performance state from the EM
@@ -387,6 +388,10 @@ int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,
{
return -EINVAL;
}
+static inline int em_dev_update_chip_binning(struct device *dev)
+{
+ return -EINVAL;
+}
#endif

#endif
diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
index 6960dd7393b2d..1494a909844a4 100644
--- a/kernel/power/energy_model.c
+++ b/kernel/power/energy_model.c
@@ -808,3 +808,54 @@ static void em_update_workfn(struct work_struct *work)
{
em_check_capacity_update();
}
+
+/**
+ * em_dev_update_chip_binning() - Update Energy Model with new values after
+ * the new voltage information is present in the OPPs.
+ * @dev : Device for which the Energy Model has to be updated.
+ *
+ * This function allows to update easily the EM with new values available in
+ * the OPP framework and DT. It can be used after the chip has been properly
+ * verified by device drivers and the voltages adjusted for the 'chip binning'.
+ * It uses the "dynamic-power-coefficient" DT property to calculate the power
+ * values for EM. For power calculation it uses the new adjusted voltage
+ * values known for OPPs, which might be changed after boot.
+ */
+int em_dev_update_chip_binning(struct device *dev)
+{
+ struct em_perf_table __rcu *em_table;
+ struct em_perf_domain *pd;
+ int i, ret;
+
+ if (IS_ERR_OR_NULL(dev))
+ return -EINVAL;
+
+ pd = em_pd_get(dev);
+ if (!pd) {
+ dev_warn(dev, "Couldn't find Energy Model %d\n", ret);
+ return -EINVAL;
+ }
+
+ em_table = em_table_dup(pd);
+ if (!em_table) {
+ dev_warn(dev, "EM: allocation failed\n");
+ return -ENOMEM;
+ }
+
+ /* Update power values which might change due to new voltage in OPPs */
+ for (i = 0; i < pd->nr_perf_states; i++) {
+ unsigned long freq = em_table->state[i].frequency;
+ unsigned long power;
+
+ ret = dev_pm_opp_calc_power(dev, &power, &freq);
+ if (ret) {
+ em_table_free(em_table);
+ return ret;
+ }
+
+ em_table->state[i].power = power;
+ }
+
+ return em_recalc_and_update(dev, pd, em_table);
+}
+EXPORT_SYMBOL_GPL(em_dev_update_chip_binning);
--
2.25.1

2024-03-14 14:32:34

by Christian Loehle

[permalink] [raw]

Subject: Re: [PATCH 3/4] PM: EM: Add em_dev_update_chip_binning()

On 14/03/2024 14:04, Lukasz Luba wrote:
> Add a function which allows to modify easily the EM after the new voltage
> information is available. The device drivers for the chip can adjust
> the voltage values after setup. The voltage for the same frequency in OPP
> can be different due to chip binning. The voltage impacts the power usage
> and the EM power values can be updated to reflect that.
>
> Signed-off-by: Lukasz Luba <[email protected]>
> ---
> include/linux/energy_model.h | 5 ++++
> kernel/power/energy_model.c | 51 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 56 insertions(+)
>
> diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h
> index 770755df852f1..d30d67c2f07cf 100644
> --- a/include/linux/energy_model.h
> +++ b/include/linux/energy_model.h
> @@ -172,6 +172,7 @@ struct em_perf_table __rcu *em_table_alloc(struct em_perf_domain *pd);
> void em_table_free(struct em_perf_table __rcu *table);
> int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,
> int nr_states);
> +int em_dev_update_chip_binning(struct device *dev);
>
> /**
> * em_pd_get_efficient_state() - Get an efficient performance state from the EM
> @@ -387,6 +388,10 @@ int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,
> {
> return -EINVAL;
> }
> +static inline int em_dev_update_chip_binning(struct device *dev)
> +{
> + return -EINVAL;
> +}
> #endif
>
> #endif
> diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
> index 6960dd7393b2d..1494a909844a4 100644
> --- a/kernel/power/energy_model.c
> +++ b/kernel/power/energy_model.c
> @@ -808,3 +808,54 @@ static void em_update_workfn(struct work_struct *work)
> {
> em_check_capacity_update();
> }
> +
> +/**
> + * em_dev_update_chip_binning() - Update Energy Model with new values after
> + * the new voltage information is present in the OPPs.
> + * @dev : Device for which the Energy Model has to be updated.
> + *
> + * This function allows to update easily the EM with new values available in
> + * the OPP framework and DT. It can be used after the chip has been properly
> + * verified by device drivers and the voltages adjusted for the 'chip binning'.
> + * It uses the "dynamic-power-coefficient" DT property to calculate the power
> + * values for EM. For power calculation it uses the new adjusted voltage
> + * values known for OPPs, which might be changed after boot.
> + */
> +int em_dev_update_chip_binning(struct device *dev)
> +{
> + struct em_perf_table __rcu *em_table;
> + struct em_perf_domain *pd;
> + int i, ret;
> +
> + if (IS_ERR_OR_NULL(dev))
> + return -EINVAL;
> +
> + pd = em_pd_get(dev);
> + if (!pd) {
> + dev_warn(dev, "Couldn't find Energy Model %d\n", ret);

ret is uninitialized at this point, I guess just
+ dev_warn(dev, "Couldn't find Energy Model\n");
already contains everything relevant.

> [...]

2024-03-15 15:54:31

by kernel test robot

[permalink] [raw]

Subject: Re: [PATCH 3/4] PM: EM: Add em_dev_update_chip_binning()

Hi Lukasz,

kernel test robot noticed the following build warnings:

[auto build test WARNING on rafael-pm/linux-next]
[also build test WARNING on linus/master next-20240315]
[cannot apply to krzk/for-next clk/clk-next soc/for-next rafael-pm/acpi-bus rafael-pm/devprop v6.8]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url: https://github.com/intel-lab-lkp/linux/commits/Lukasz-Luba/OPP-OF-Export-dev_opp_pm_calc_power-for-usage-from-EM/20240314-220719
base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next
patch link: https://lore.kernel.org/r/20240314140421.3563571-4-lukasz.luba%40arm.com
patch subject: [PATCH 3/4] PM: EM: Add em_dev_update_chip_binning()
config: x86_64-randconfig-123-20240315 (https://download.01.org/0day-ci/archive/20240315/[email protected]/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240315/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

sparse warnings: (new ones prefixed by >>)
kernel/power/energy_model.c:168:15: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct em_perf_table [noderef] __rcu *table @@ got struct em_perf_table * @@
kernel/power/energy_model.c:168:15: sparse: expected struct em_perf_table [noderef] __rcu *table
kernel/power/energy_model.c:168:15: sparse: got struct em_perf_table *
kernel/power/energy_model.c:169:15: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected void const *objp @@ got struct em_perf_table [noderef] __rcu *table @@
kernel/power/energy_model.c:169:15: sparse: expected void const *objp
kernel/power/energy_model.c:169:15: sparse: got struct em_perf_table [noderef] __rcu *table
kernel/power/energy_model.c:177:15: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct em_perf_table [noderef] __rcu *table @@ got struct em_perf_table * @@
kernel/power/energy_model.c:177:15: sparse: expected struct em_perf_table [noderef] __rcu *table
kernel/power/energy_model.c:177:15: sparse: got struct em_perf_table *
kernel/power/energy_model.c:179:19: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct callback_head *head @@ got struct callback_head [noderef] __rcu * @@
kernel/power/energy_model.c:179:19: sparse: expected struct callback_head *head
kernel/power/energy_model.c:179:19: sparse: got struct callback_head [noderef] __rcu *
kernel/power/energy_model.c:190:19: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct kref *kref @@ got struct kref [noderef] __rcu * @@
kernel/power/energy_model.c:190:19: sparse: expected struct kref *kref
kernel/power/energy_model.c:190:19: sparse: got struct kref [noderef] __rcu *
kernel/power/energy_model.c:208:15: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct em_perf_table [noderef] __rcu *table @@ got void * @@
kernel/power/energy_model.c:208:15: sparse: expected struct em_perf_table [noderef] __rcu *table
kernel/power/energy_model.c:208:15: sparse: got void *
kernel/power/energy_model.c:212:20: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct kref *kref @@ got struct kref [noderef] __rcu * @@
kernel/power/energy_model.c:212:20: sparse: expected struct kref *kref
kernel/power/energy_model.c:212:20: sparse: got struct kref [noderef] __rcu *
kernel/power/energy_model.c:328:19: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct kref *kref @@ got struct kref [noderef] __rcu * @@
kernel/power/energy_model.c:328:19: sparse: expected struct kref *kref
kernel/power/energy_model.c:328:19: sparse: got struct kref [noderef] __rcu *
kernel/power/energy_model.c:333:45: sparse: sparse: incorrect type in argument 2 (different address spaces) @@ expected struct em_perf_state *table @@ got struct em_perf_state [noderef] __rcu * @@
kernel/power/energy_model.c:333:45: sparse: expected struct em_perf_state *table
kernel/power/energy_model.c:333:45: sparse: got struct em_perf_state [noderef] __rcu *
kernel/power/energy_model.c:433:45: sparse: sparse: incorrect type in argument 3 (different address spaces) @@ expected struct em_perf_state *table @@ got struct em_perf_state [noderef] __rcu * @@
kernel/power/energy_model.c:433:45: sparse: expected struct em_perf_state *table
kernel/power/energy_model.c:433:45: sparse: got struct em_perf_state [noderef] __rcu *
kernel/power/energy_model.c:450:15: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected void const *objp @@ got struct em_perf_table [noderef] __rcu *[assigned] em_table @@
kernel/power/energy_model.c:450:15: sparse: expected void const *objp
kernel/power/energy_model.c:450:15: sparse: got struct em_perf_table [noderef] __rcu *[assigned] em_table
kernel/power/energy_model.c:621:55: sparse: sparse: incorrect type in argument 2 (different address spaces) @@ expected struct em_perf_state *table @@ got struct em_perf_state [noderef] __rcu * @@
kernel/power/energy_model.c:621:55: sparse: expected struct em_perf_state *table
kernel/power/energy_model.c:621:55: sparse: got struct em_perf_state [noderef] __rcu *
kernel/power/energy_model.c:676:16: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct em_perf_state *new_ps @@ got struct em_perf_state [noderef] __rcu * @@
kernel/power/energy_model.c:676:16: sparse: expected struct em_perf_state *new_ps
kernel/power/energy_model.c:676:16: sparse: got struct em_perf_state [noderef] __rcu *
kernel/power/energy_model.c:694:37: sparse: sparse: incorrect type in argument 2 (different address spaces) @@ expected struct em_perf_state *table @@ got struct em_perf_state [noderef] __rcu * @@
kernel/power/energy_model.c:694:37: sparse: expected struct em_perf_state *table
kernel/power/energy_model.c:694:37: sparse: got struct em_perf_state [noderef] __rcu *
kernel/power/energy_model.c:729:38: sparse: sparse: incorrect type in argument 3 (different address spaces) @@ expected struct em_perf_state *table @@ got struct em_perf_state [noderef] __rcu * @@
kernel/power/energy_model.c:729:38: sparse: expected struct em_perf_state *table
kernel/power/energy_model.c:729:38: sparse: got struct em_perf_state [noderef] __rcu *
>> kernel/power/energy_model.c:836:53: sparse: sparse: dereference of noderef expression
kernel/power/energy_model.c:845:32: sparse: sparse: dereference of noderef expression

vim +836 kernel/power/energy_model.c

800
801 /**
802 * em_dev_update_chip_binning() - Update Energy Model with new values after
803 * the new voltage information is present in the OPPs.
804 * @dev : Device for which the Energy Model has to be updated.
805 *
806 * This function allows to update easily the EM with new values available in
807 * the OPP framework and DT. It can be used after the chip has been properly
808 * verified by device drivers and the voltages adjusted for the 'chip binning'.
809 * It uses the "dynamic-power-coefficient" DT property to calculate the power
810 * values for EM. For power calculation it uses the new adjusted voltage
811 * values known for OPPs, which might be changed after boot.
812 */
813 int em_dev_update_chip_binning(struct device *dev)
814 {
815 struct em_perf_table __rcu *em_table;
816 struct em_perf_domain *pd;
817 int i, ret;
818
819 if (IS_ERR_OR_NULL(dev))
820 return -EINVAL;
821
822 pd = em_pd_get(dev);
823 if (!pd) {
824 dev_warn(dev, "Couldn't find Energy Model %d\n", ret);
825 return -EINVAL;
826 }
827
828 em_table = em_table_dup(pd);
829 if (!em_table) {
830 dev_warn(dev, "EM: allocation failed\n");
831 return -ENOMEM;
832 }
833
834 /* Update power values which might change due to new voltage in OPPs */
835 for (i = 0; i < pd->nr_perf_states; i++) {
> 836 unsigned long freq = em_table->state[i].frequency;

--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

2024-03-15 16:36:35

by kernel test robot

[permalink] [raw]

Subject: Re: [PATCH 3/4] PM: EM: Add em_dev_update_chip_binning()

2024-03-22 10:26:45

by Lukasz Luba

[permalink] [raw]

Subject: Re: [PATCH 3/4] PM: EM: Add em_dev_update_chip_binning()

Hi Christian,

On 3/14/24 14:32, Christian Loehle wrote:
> On 14/03/2024 14:04, Lukasz Luba wrote:
>> Add a function which allows to modify easily the EM after the new voltage
>> information is available. The device drivers for the chip can adjust
>> the voltage values after setup. The voltage for the same frequency in OPP
>> can be different due to chip binning. The voltage impacts the power usage
>> and the EM power values can be updated to reflect that.
>>
>> Signed-off-by: Lukasz Luba <[email protected]>
>> ---
>> include/linux/energy_model.h | 5 ++++
>> kernel/power/energy_model.c | 51 ++++++++++++++++++++++++++++++++++++
>> 2 files changed, 56 insertions(+)
>>
>> diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h
>> index 770755df852f1..d30d67c2f07cf 100644
>> --- a/include/linux/energy_model.h
>> +++ b/include/linux/energy_model.h
>> @@ -172,6 +172,7 @@ struct em_perf_table __rcu *em_table_alloc(struct em_perf_domain *pd);
>> void em_table_free(struct em_perf_table __rcu *table);
>> int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,
>> int nr_states);
>> +int em_dev_update_chip_binning(struct device *dev);
>>
>> /**
>> * em_pd_get_efficient_state() - Get an efficient performance state from the EM
>> @@ -387,6 +388,10 @@ int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,
>> {
>> return -EINVAL;
>> }
>> +static inline int em_dev_update_chip_binning(struct device *dev)
>> +{
>> + return -EINVAL;
>> +}
>> #endif
>>
>> #endif
>> diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
>> index 6960dd7393b2d..1494a909844a4 100644
>> --- a/kernel/power/energy_model.c
>> +++ b/kernel/power/energy_model.c
>> @@ -808,3 +808,54 @@ static void em_update_workfn(struct work_struct *work)
>> {
>> em_check_capacity_update();
>> }
>> +
>> +/**
>> + * em_dev_update_chip_binning() - Update Energy Model with new values after
>> + * the new voltage information is present in the OPPs.
>> + * @dev : Device for which the Energy Model has to be updated.
>> + *
>> + * This function allows to update easily the EM with new values available in
>> + * the OPP framework and DT. It can be used after the chip has been properly
>> + * verified by device drivers and the voltages adjusted for the 'chip binning'.
>> + * It uses the "dynamic-power-coefficient" DT property to calculate the power
>> + * values for EM. For power calculation it uses the new adjusted voltage
>> + * values known for OPPs, which might be changed after boot.
>> + */
>> +int em_dev_update_chip_binning(struct device *dev)
>> +{
>> + struct em_perf_table __rcu *em_table;
>> + struct em_perf_domain *pd;
>> + int i, ret;
>> +
>> + if (IS_ERR_OR_NULL(dev))
>> + return -EINVAL;
>> +
>> + pd = em_pd_get(dev);
>> + if (!pd) {
>> + dev_warn(dev, "Couldn't find Energy Model %d\n", ret);
>
> ret is uninitialized at this point, I guess just
> + dev_warn(dev, "Couldn't find Energy Model\n");
> already contains everything relevant.
>

Good catch, thanks! Yes, I agree it contains enough. I'm going
to send v2 with this.

Regards,
Lukasz