From: Nicola Mazzucato <nicola.mazzucato@arm.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, sudeep.holla@arm.com, rjw@rjwysocki.net, vireshk@kernel.org, cristian.marussi@arm.com Cc: morten.rasmussen@arm.com, chris.redpath@arm.com, nicola.mazzucato@arm.com Subject: [PATCH v6 3/4] scmi-cpufreq: Get opp_shared_cpus from opp-v2 for EM Date: Mon, 11 Jan 2021 15:45:23 +0000 [thread overview] Message-ID: <20210111154524.20196-4-nicola.mazzucato@arm.com> (raw) In-Reply-To: <20210111154524.20196-1-nicola.mazzucato@arm.com> By design, SCMI performance domains define the granularity of performance controls, they do not describe any underlying hardware dependencies (although they may match in many cases). It is therefore possible to have some platforms where hardware may have the ability to control CPU performance at different granularity and choose to describe fine-grained performance control through SCMI. In such situations, the energy model would be provided with inaccurate information based on controls, while it still needs to know the performance boundaries. To restore correct functionality, retrieve information of CPUs under the same performance domain from operating-points-v2 in DT, and pass it on to EM. Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com> --- drivers/cpufreq/scmi-cpufreq.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c index 4aa97cdc5997..ff6ba6fab58b 100644 --- a/drivers/cpufreq/scmi-cpufreq.c +++ b/drivers/cpufreq/scmi-cpufreq.c @@ -226,9 +226,12 @@ static int scmi_init_device(const struct scmi_handle *handle, int cpu) struct em_data_callback em_cb = EM_DATA_CB(scmi_get_cpu_power); bool power_scale_mw; cpumask_var_t scmi_cpus; + cpumask_var_t opp_shared_cpus; if (!zalloc_cpumask_var(&scmi_cpus, GFP_KERNEL)) return -ENOMEM; + if (!zalloc_cpumask_var(&opp_shared_cpus, GFP_KERNEL)) + return -ENOMEM; cpumask_set_cpu(cpu, scmi_cpus); @@ -240,6 +243,20 @@ static int scmi_init_device(const struct scmi_handle *handle, int cpu) goto free_cpumask; } + /* + * The OPP 'sharing cpus' info may come from dt through an empty opp + * table and opp-shared. If found, it takes precedence over the SCMI + * domain IDs info. + */ + ret = dev_pm_opp_of_get_sharing_cpus(cpu_dev, opp_shared_cpus); + if (ret || !cpumask_weight(opp_shared_cpus)) { + /* + * Either opp-table is not set or no opp-shared was found, + * use the information from SCMI domain IDs. + */ + cpumask_copy(opp_shared_cpus, scmi_cpus); + } + /* * We get here for each CPU. Add OPPs only on those CPUs for which we * haven't already done so, or set their OPPs as shared. @@ -252,7 +269,7 @@ static int scmi_init_device(const struct scmi_handle *handle, int cpu) goto free_cpumask; } - ret = dev_pm_opp_set_sharing_cpus(cpu_dev, scmi_cpus); + ret = dev_pm_opp_set_sharing_cpus(cpu_dev, opp_shared_cpus); if (ret) { dev_err(cpu_dev, "%s: failed to mark OPPs as shared: %d\n", __func__, ret); @@ -269,7 +286,7 @@ static int scmi_init_device(const struct scmi_handle *handle, int cpu) } power_scale_mw = handle->perf_ops->power_scale_mw_get(handle); - em_dev_register_perf_domain(cpu_dev, nr_opp, &em_cb, scmi_cpus, + em_dev_register_perf_domain(cpu_dev, nr_opp, &em_cb, opp_shared_cpus, power_scale_mw); } @@ -284,6 +301,7 @@ static int scmi_init_device(const struct scmi_handle *handle, int cpu) free_cpumask: free_cpumask_var(scmi_cpus); + free_cpumask_var(opp_shared_cpus); return ret; } -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Nicola Mazzucato <nicola.mazzucato@arm.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, sudeep.holla@arm.com, rjw@rjwysocki.net, vireshk@kernel.org, cristian.marussi@arm.com Cc: chris.redpath@arm.com, morten.rasmussen@arm.com, nicola.mazzucato@arm.com Subject: [PATCH v6 3/4] scmi-cpufreq: Get opp_shared_cpus from opp-v2 for EM Date: Mon, 11 Jan 2021 15:45:23 +0000 [thread overview] Message-ID: <20210111154524.20196-4-nicola.mazzucato@arm.com> (raw) In-Reply-To: <20210111154524.20196-1-nicola.mazzucato@arm.com> By design, SCMI performance domains define the granularity of performance controls, they do not describe any underlying hardware dependencies (although they may match in many cases). It is therefore possible to have some platforms where hardware may have the ability to control CPU performance at different granularity and choose to describe fine-grained performance control through SCMI. In such situations, the energy model would be provided with inaccurate information based on controls, while it still needs to know the performance boundaries. To restore correct functionality, retrieve information of CPUs under the same performance domain from operating-points-v2 in DT, and pass it on to EM. Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com> --- drivers/cpufreq/scmi-cpufreq.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c index 4aa97cdc5997..ff6ba6fab58b 100644 --- a/drivers/cpufreq/scmi-cpufreq.c +++ b/drivers/cpufreq/scmi-cpufreq.c @@ -226,9 +226,12 @@ static int scmi_init_device(const struct scmi_handle *handle, int cpu) struct em_data_callback em_cb = EM_DATA_CB(scmi_get_cpu_power); bool power_scale_mw; cpumask_var_t scmi_cpus; + cpumask_var_t opp_shared_cpus; if (!zalloc_cpumask_var(&scmi_cpus, GFP_KERNEL)) return -ENOMEM; + if (!zalloc_cpumask_var(&opp_shared_cpus, GFP_KERNEL)) + return -ENOMEM; cpumask_set_cpu(cpu, scmi_cpus); @@ -240,6 +243,20 @@ static int scmi_init_device(const struct scmi_handle *handle, int cpu) goto free_cpumask; } + /* + * The OPP 'sharing cpus' info may come from dt through an empty opp + * table and opp-shared. If found, it takes precedence over the SCMI + * domain IDs info. + */ + ret = dev_pm_opp_of_get_sharing_cpus(cpu_dev, opp_shared_cpus); + if (ret || !cpumask_weight(opp_shared_cpus)) { + /* + * Either opp-table is not set or no opp-shared was found, + * use the information from SCMI domain IDs. + */ + cpumask_copy(opp_shared_cpus, scmi_cpus); + } + /* * We get here for each CPU. Add OPPs only on those CPUs for which we * haven't already done so, or set their OPPs as shared. @@ -252,7 +269,7 @@ static int scmi_init_device(const struct scmi_handle *handle, int cpu) goto free_cpumask; } - ret = dev_pm_opp_set_sharing_cpus(cpu_dev, scmi_cpus); + ret = dev_pm_opp_set_sharing_cpus(cpu_dev, opp_shared_cpus); if (ret) { dev_err(cpu_dev, "%s: failed to mark OPPs as shared: %d\n", __func__, ret); @@ -269,7 +286,7 @@ static int scmi_init_device(const struct scmi_handle *handle, int cpu) } power_scale_mw = handle->perf_ops->power_scale_mw_get(handle); - em_dev_register_perf_domain(cpu_dev, nr_opp, &em_cb, scmi_cpus, + em_dev_register_perf_domain(cpu_dev, nr_opp, &em_cb, opp_shared_cpus, power_scale_mw); } @@ -284,6 +301,7 @@ static int scmi_init_device(const struct scmi_handle *handle, int cpu) free_cpumask: free_cpumask_var(scmi_cpus); + free_cpumask_var(opp_shared_cpus); return ret; } -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-11 15:44 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-11 15:45 [PATCH v6 0/4] CPUFreq: Add support for opp-sharing cpus Nicola Mazzucato 2021-01-11 15:45 ` Nicola Mazzucato 2021-01-11 15:45 ` [PATCH v6 1/4] scmi-cpufreq: Remove deferred probe Nicola Mazzucato 2021-01-11 15:45 ` Nicola Mazzucato 2021-01-11 15:45 ` [PATCH v6 2/4] scmi-cpufreq: Move CPU initialisation to probe Nicola Mazzucato 2021-01-11 15:45 ` Nicola Mazzucato 2021-01-12 11:17 ` Viresh Kumar 2021-01-12 11:17 ` Viresh Kumar 2021-01-13 11:55 ` Nicola Mazzucato 2021-01-13 11:55 ` Nicola Mazzucato 2021-01-14 5:07 ` Viresh Kumar 2021-01-14 5:07 ` Viresh Kumar 2021-01-14 13:37 ` Nicola Mazzucato 2021-01-14 13:37 ` Nicola Mazzucato 2021-01-14 16:54 ` Cristian Marussi 2021-01-14 16:54 ` Cristian Marussi 2021-01-30 9:43 ` Nicola Mazzucato 2021-01-30 9:43 ` Nicola Mazzucato 2021-01-11 15:45 ` Nicola Mazzucato [this message] 2021-01-11 15:45 ` [PATCH v6 3/4] scmi-cpufreq: Get opp_shared_cpus from opp-v2 for EM Nicola Mazzucato 2021-01-12 11:20 ` Viresh Kumar 2021-01-12 11:20 ` Viresh Kumar 2021-01-13 12:00 ` Nicola Mazzucato 2021-01-13 12:00 ` Nicola Mazzucato 2021-01-11 15:45 ` [PATCH v6 4/4] cpufreq: blacklist Arm Vexpress platforms in cpufreq-dt-platdev Nicola Mazzucato 2021-01-11 15:45 ` Nicola Mazzucato
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210111154524.20196-4-nicola.mazzucato@arm.com \ --to=nicola.mazzucato@arm.com \ --cc=chris.redpath@arm.com \ --cc=cristian.marussi@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=morten.rasmussen@arm.com \ --cc=rjw@rjwysocki.net \ --cc=sudeep.holla@arm.com \ --cc=vireshk@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.