| Message ID | 20240314140421.3563571-4-lukasz.luba@arm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Update Energy Model after chip binning adjusted voltages | expand |
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 <lukasz.luba@arm.com> > --- > 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. > [...]
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/202403152322.1OIlZSAj-lkp@intel.com/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/202403152322.1OIlZSAj-lkp@intel.com/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 <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202403152322.1OIlZSAj-lkp@intel.com/ 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;
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: i386-randconfig-141-20240315 (https://download.01.org/0day-ci/archive/20240316/202403160033.Kh6R75dh-lkp@intel.com/config) compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240316/202403160033.Kh6R75dh-lkp@intel.com/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 <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202403160033.Kh6R75dh-lkp@intel.com/ All warnings (new ones prefixed by >>): >> kernel/power/energy_model.c:824:52: warning: variable 'ret' is uninitialized when used here [-Wuninitialized] 824 | dev_warn(dev, "Couldn't find Energy Model %d\n", ret); | ^~~ include/linux/dev_printk.h:146:70: note: expanded from macro 'dev_warn' 146 | dev_printk_index_wrap(_dev_warn, KERN_WARNING, dev, dev_fmt(fmt), ##__VA_ARGS__) | ^~~~~~~~~~~ include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap' 110 | _p_func(dev, fmt, ##__VA_ARGS__); \ | ^~~~~~~~~~~ kernel/power/energy_model.c:817:12: note: initialize the variable 'ret' to silence this warning 817 | int i, ret; | ^ | = 0 1 warning generated. vim +/ret +824 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);
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 <lukasz.luba@arm.com> >> --- >> 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
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);
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 <lukasz.luba@arm.com> --- include/linux/energy_model.h | 5 ++++ kernel/power/energy_model.c | 51 ++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+)