* [PATCH] cpufreq: scmi: Fix frequency invariance in slow path
@ 2019-01-09 10:42 Quentin Perret
2019-01-09 10:45 ` Viresh Kumar
2019-01-09 10:59 ` Sudeep Holla
0 siblings, 2 replies; 9+ messages in thread
From: Quentin Perret @ 2019-01-09 10:42 UTC (permalink / raw)
To: sudeep.holla, rjw, viresh.kumar
Cc: linux-pm, linux-kernel, qais.yousef, quentin.perret,
dietmar.eggemann, linux-arm-kernel
The scmi-cpufreq driver calls the arch_set_freq_scale() callback on
frequency changes to provide scale-invariant load-tracking signals to
the scheduler. However, in the slow path, it does so while specifying
the current and max frequencies in different units, hence resulting in a
broken freq_scale factor.
Fix this by passing all frequencies in KHz, as stored in the CPUFreq
frequency table.
Fixes: 99d6bdf33877 ("cpufreq: add support for CPU DVFS based on SCMI
message protocol")
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
---
drivers/cpufreq/scmi-cpufreq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
index 50b1551ba894..3f0693439486 100644
--- a/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@ -52,9 +52,9 @@ scmi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
int ret;
struct scmi_data *priv = policy->driver_data;
struct scmi_perf_ops *perf_ops = handle->perf_ops;
- u64 freq = policy->freq_table[index].frequency * 1000;
+ u64 freq = policy->freq_table[index].frequency;
- ret = perf_ops->freq_set(handle, priv->domain_id, freq, false);
+ ret = perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);
if (!ret)
arch_set_freq_scale(policy->related_cpus, freq,
policy->cpuinfo.max_freq);
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] cpufreq: scmi: Fix frequency invariance in slow path
2019-01-09 10:42 [PATCH] cpufreq: scmi: Fix frequency invariance in slow path Quentin Perret
@ 2019-01-09 10:45 ` Viresh Kumar
2019-01-09 10:56 ` Rafael J. Wysocki
2019-01-09 10:59 ` Sudeep Holla
1 sibling, 1 reply; 9+ messages in thread
From: Viresh Kumar @ 2019-01-09 10:45 UTC (permalink / raw)
To: Quentin Perret
Cc: sudeep.holla, rjw, linux-arm-kernel, linux-pm, linux-kernel,
dietmar.eggemann, qais.yousef
On 09-01-19, 10:42, Quentin Perret wrote:
> The scmi-cpufreq driver calls the arch_set_freq_scale() callback on
> frequency changes to provide scale-invariant load-tracking signals to
> the scheduler. However, in the slow path, it does so while specifying
> the current and max frequencies in different units, hence resulting in a
> broken freq_scale factor.
>
> Fix this by passing all frequencies in KHz, as stored in the CPUFreq
> frequency table.
>
> Fixes: 99d6bdf33877 ("cpufreq: add support for CPU DVFS based on SCMI
> message protocol")
> Signed-off-by: Quentin Perret <quentin.perret@arm.com>
> ---
> drivers/cpufreq/scmi-cpufreq.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
> index 50b1551ba894..3f0693439486 100644
> --- a/drivers/cpufreq/scmi-cpufreq.c
> +++ b/drivers/cpufreq/scmi-cpufreq.c
> @@ -52,9 +52,9 @@ scmi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
> int ret;
> struct scmi_data *priv = policy->driver_data;
> struct scmi_perf_ops *perf_ops = handle->perf_ops;
> - u64 freq = policy->freq_table[index].frequency * 1000;
> + u64 freq = policy->freq_table[index].frequency;
>
> - ret = perf_ops->freq_set(handle, priv->domain_id, freq, false);
> + ret = perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);
> if (!ret)
> arch_set_freq_scale(policy->related_cpus, freq,
> policy->cpuinfo.max_freq);
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
--
viresh
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] cpufreq: scmi: Fix frequency invariance in slow path
2019-01-09 10:45 ` Viresh Kumar
@ 2019-01-09 10:56 ` Rafael J. Wysocki
2019-01-09 10:59 ` Quentin Perret
2019-01-09 10:59 ` Viresh Kumar
0 siblings, 2 replies; 9+ messages in thread
From: Rafael J. Wysocki @ 2019-01-09 10:56 UTC (permalink / raw)
To: Viresh Kumar, Quentin Perret
Cc: sudeep.holla, linux-arm-kernel, linux-pm, linux-kernel,
dietmar.eggemann, qais.yousef
On Wednesday, January 9, 2019 11:45:11 AM CET Viresh Kumar wrote:
> On 09-01-19, 10:42, Quentin Perret wrote:
> > The scmi-cpufreq driver calls the arch_set_freq_scale() callback on
> > frequency changes to provide scale-invariant load-tracking signals to
> > the scheduler. However, in the slow path, it does so while specifying
> > the current and max frequencies in different units, hence resulting in a
> > broken freq_scale factor.
> >
> > Fix this by passing all frequencies in KHz, as stored in the CPUFreq
> > frequency table.
> >
> > Fixes: 99d6bdf33877 ("cpufreq: add support for CPU DVFS based on SCMI
> > message protocol")
> > Signed-off-by: Quentin Perret <quentin.perret@arm.com>
> > ---
> > drivers/cpufreq/scmi-cpufreq.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
> > index 50b1551ba894..3f0693439486 100644
> > --- a/drivers/cpufreq/scmi-cpufreq.c
> > +++ b/drivers/cpufreq/scmi-cpufreq.c
> > @@ -52,9 +52,9 @@ scmi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
> > int ret;
> > struct scmi_data *priv = policy->driver_data;
> > struct scmi_perf_ops *perf_ops = handle->perf_ops;
> > - u64 freq = policy->freq_table[index].frequency * 1000;
> > + u64 freq = policy->freq_table[index].frequency;
> >
> > - ret = perf_ops->freq_set(handle, priv->domain_id, freq, false);
> > + ret = perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);
> > if (!ret)
> > arch_set_freq_scale(policy->related_cpus, freq,
> > policy->cpuinfo.max_freq);
>
> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
This would be stable-candidate I guess?
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] cpufreq: scmi: Fix frequency invariance in slow path
2019-01-09 10:56 ` Rafael J. Wysocki
@ 2019-01-09 10:59 ` Quentin Perret
2019-01-09 11:03 ` Rafael J. Wysocki
2019-01-09 10:59 ` Viresh Kumar
1 sibling, 1 reply; 9+ messages in thread
From: Quentin Perret @ 2019-01-09 10:59 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Viresh Kumar, sudeep.holla, linux-arm-kernel, linux-pm,
linux-kernel, dietmar.eggemann, qais.yousef
On Wednesday 09 Jan 2019 at 11:56:06 (+0100), Rafael J. Wysocki wrote:
> On Wednesday, January 9, 2019 11:45:11 AM CET Viresh Kumar wrote:
> > On 09-01-19, 10:42, Quentin Perret wrote:
> > > The scmi-cpufreq driver calls the arch_set_freq_scale() callback on
> > > frequency changes to provide scale-invariant load-tracking signals to
> > > the scheduler. However, in the slow path, it does so while specifying
> > > the current and max frequencies in different units, hence resulting in a
> > > broken freq_scale factor.
> > >
> > > Fix this by passing all frequencies in KHz, as stored in the CPUFreq
> > > frequency table.
> > >
> > > Fixes: 99d6bdf33877 ("cpufreq: add support for CPU DVFS based on SCMI
> > > message protocol")
> > > Signed-off-by: Quentin Perret <quentin.perret@arm.com>
> > > ---
> > > drivers/cpufreq/scmi-cpufreq.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
> > > index 50b1551ba894..3f0693439486 100644
> > > --- a/drivers/cpufreq/scmi-cpufreq.c
> > > +++ b/drivers/cpufreq/scmi-cpufreq.c
> > > @@ -52,9 +52,9 @@ scmi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
> > > int ret;
> > > struct scmi_data *priv = policy->driver_data;
> > > struct scmi_perf_ops *perf_ops = handle->perf_ops;
> > > - u64 freq = policy->freq_table[index].frequency * 1000;
> > > + u64 freq = policy->freq_table[index].frequency;
> > >
> > > - ret = perf_ops->freq_set(handle, priv->domain_id, freq, false);
> > > + ret = perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);
> > > if (!ret)
> > > arch_set_freq_scale(policy->related_cpus, freq,
> > > policy->cpuinfo.max_freq);
> >
> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
>
> This would be stable-candidate I guess?
I think so yes. I was hoping the 'Fixes:' tag would be enough ? Or do I
still need to CC stable too ?
Thanks,
Quentin
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] cpufreq: scmi: Fix frequency invariance in slow path
2019-01-09 10:59 ` Quentin Perret
@ 2019-01-09 11:03 ` Rafael J. Wysocki
2019-01-09 11:07 ` Quentin Perret
0 siblings, 1 reply; 9+ messages in thread
From: Rafael J. Wysocki @ 2019-01-09 11:03 UTC (permalink / raw)
To: Quentin Perret
Cc: Viresh Kumar, sudeep.holla, linux-arm-kernel, linux-pm,
linux-kernel, dietmar.eggemann, qais.yousef
On Wednesday, January 9, 2019 11:59:05 AM CET Quentin Perret wrote:
> On Wednesday 09 Jan 2019 at 11:56:06 (+0100), Rafael J. Wysocki wrote:
> > On Wednesday, January 9, 2019 11:45:11 AM CET Viresh Kumar wrote:
> > > On 09-01-19, 10:42, Quentin Perret wrote:
> > > > The scmi-cpufreq driver calls the arch_set_freq_scale() callback on
> > > > frequency changes to provide scale-invariant load-tracking signals to
> > > > the scheduler. However, in the slow path, it does so while specifying
> > > > the current and max frequencies in different units, hence resulting in a
> > > > broken freq_scale factor.
> > > >
> > > > Fix this by passing all frequencies in KHz, as stored in the CPUFreq
> > > > frequency table.
> > > >
> > > > Fixes: 99d6bdf33877 ("cpufreq: add support for CPU DVFS based on SCMI
> > > > message protocol")
> > > > Signed-off-by: Quentin Perret <quentin.perret@arm.com>
> > > > ---
> > > > drivers/cpufreq/scmi-cpufreq.c | 4 ++--
> > > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
> > > > index 50b1551ba894..3f0693439486 100644
> > > > --- a/drivers/cpufreq/scmi-cpufreq.c
> > > > +++ b/drivers/cpufreq/scmi-cpufreq.c
> > > > @@ -52,9 +52,9 @@ scmi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
> > > > int ret;
> > > > struct scmi_data *priv = policy->driver_data;
> > > > struct scmi_perf_ops *perf_ops = handle->perf_ops;
> > > > - u64 freq = policy->freq_table[index].frequency * 1000;
> > > > + u64 freq = policy->freq_table[index].frequency;
> > > >
> > > > - ret = perf_ops->freq_set(handle, priv->domain_id, freq, false);
> > > > + ret = perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);
> > > > if (!ret)
> > > > arch_set_freq_scale(policy->related_cpus, freq,
> > > > policy->cpuinfo.max_freq);
> > >
> > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> >
> > This would be stable-candidate I guess?
>
> I think so yes. I was hoping the 'Fixes:' tag would be enough ?
It doesn't cause -stable to pick up commits automatically if that's
what you're asking about.
> Or do I still need to CC stable too ?
No, you don't need to (and should not) CC -stable yourself.
You can, however, add a Cc: <stable..> tag to the patch which helps
maintainers a bit.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] cpufreq: scmi: Fix frequency invariance in slow path
2019-01-09 11:03 ` Rafael J. Wysocki
@ 2019-01-09 11:07 ` Quentin Perret
0 siblings, 0 replies; 9+ messages in thread
From: Quentin Perret @ 2019-01-09 11:07 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Viresh Kumar, sudeep.holla, linux-arm-kernel, linux-pm,
linux-kernel, dietmar.eggemann, qais.yousef
On Wednesday 09 Jan 2019 at 12:03:49 (+0100), Rafael J. Wysocki wrote:
> On Wednesday, January 9, 2019 11:59:05 AM CET Quentin Perret wrote:
> > On Wednesday 09 Jan 2019 at 11:56:06 (+0100), Rafael J. Wysocki wrote:
> > > On Wednesday, January 9, 2019 11:45:11 AM CET Viresh Kumar wrote:
> > > > On 09-01-19, 10:42, Quentin Perret wrote:
> > > > > The scmi-cpufreq driver calls the arch_set_freq_scale() callback on
> > > > > frequency changes to provide scale-invariant load-tracking signals to
> > > > > the scheduler. However, in the slow path, it does so while specifying
> > > > > the current and max frequencies in different units, hence resulting in a
> > > > > broken freq_scale factor.
> > > > >
> > > > > Fix this by passing all frequencies in KHz, as stored in the CPUFreq
> > > > > frequency table.
> > > > >
> > > > > Fixes: 99d6bdf33877 ("cpufreq: add support for CPU DVFS based on SCMI
> > > > > message protocol")
> > > > > Signed-off-by: Quentin Perret <quentin.perret@arm.com>
> > > > > ---
> > > > > drivers/cpufreq/scmi-cpufreq.c | 4 ++--
> > > > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > > > >
> > > > > diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
> > > > > index 50b1551ba894..3f0693439486 100644
> > > > > --- a/drivers/cpufreq/scmi-cpufreq.c
> > > > > +++ b/drivers/cpufreq/scmi-cpufreq.c
> > > > > @@ -52,9 +52,9 @@ scmi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
> > > > > int ret;
> > > > > struct scmi_data *priv = policy->driver_data;
> > > > > struct scmi_perf_ops *perf_ops = handle->perf_ops;
> > > > > - u64 freq = policy->freq_table[index].frequency * 1000;
> > > > > + u64 freq = policy->freq_table[index].frequency;
> > > > >
> > > > > - ret = perf_ops->freq_set(handle, priv->domain_id, freq, false);
> > > > > + ret = perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);
> > > > > if (!ret)
> > > > > arch_set_freq_scale(policy->related_cpus, freq,
> > > > > policy->cpuinfo.max_freq);
> > > >
> > > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> > >
> > > This would be stable-candidate I guess?
> >
> > I think so yes. I was hoping the 'Fixes:' tag would be enough ?
>
> It doesn't cause -stable to pick up commits automatically if that's
> what you're asking about.
>
> > Or do I still need to CC stable too ?
>
> No, you don't need to (and should not) CC -stable yourself.
>
> You can, however, add a Cc: <stable..> tag to the patch which helps
> maintainers a bit.
OK, will do from now on.
Thanks !
Quentin
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] cpufreq: scmi: Fix frequency invariance in slow path
2019-01-09 10:56 ` Rafael J. Wysocki
2019-01-09 10:59 ` Quentin Perret
@ 2019-01-09 10:59 ` Viresh Kumar
1 sibling, 0 replies; 9+ messages in thread
From: Viresh Kumar @ 2019-01-09 10:59 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Quentin Perret, sudeep.holla, linux-arm-kernel, linux-pm,
linux-kernel, dietmar.eggemann, qais.yousef
On 09-01-19, 11:56, Rafael J. Wysocki wrote:
> On Wednesday, January 9, 2019 11:45:11 AM CET Viresh Kumar wrote:
> > On 09-01-19, 10:42, Quentin Perret wrote:
> > > The scmi-cpufreq driver calls the arch_set_freq_scale() callback on
> > > frequency changes to provide scale-invariant load-tracking signals to
> > > the scheduler. However, in the slow path, it does so while specifying
> > > the current and max frequencies in different units, hence resulting in a
> > > broken freq_scale factor.
> > >
> > > Fix this by passing all frequencies in KHz, as stored in the CPUFreq
> > > frequency table.
> > >
> > > Fixes: 99d6bdf33877 ("cpufreq: add support for CPU DVFS based on SCMI
> > > message protocol")
> > > Signed-off-by: Quentin Perret <quentin.perret@arm.com>
> > > ---
> > > drivers/cpufreq/scmi-cpufreq.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
> > > index 50b1551ba894..3f0693439486 100644
> > > --- a/drivers/cpufreq/scmi-cpufreq.c
> > > +++ b/drivers/cpufreq/scmi-cpufreq.c
> > > @@ -52,9 +52,9 @@ scmi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
> > > int ret;
> > > struct scmi_data *priv = policy->driver_data;
> > > struct scmi_perf_ops *perf_ops = handle->perf_ops;
> > > - u64 freq = policy->freq_table[index].frequency * 1000;
> > > + u64 freq = policy->freq_table[index].frequency;
> > >
> > > - ret = perf_ops->freq_set(handle, priv->domain_id, freq, false);
> > > + ret = perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);
> > > if (!ret)
> > > arch_set_freq_scale(policy->related_cpus, freq,
> > > policy->cpuinfo.max_freq);
> >
> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
>
> This would be stable-candidate I guess?
Cc: 4.17+ <stable@vger.kernel.org> # v4.17+
--
viresh
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] cpufreq: scmi: Fix frequency invariance in slow path
2019-01-09 10:42 [PATCH] cpufreq: scmi: Fix frequency invariance in slow path Quentin Perret
2019-01-09 10:45 ` Viresh Kumar
@ 2019-01-09 10:59 ` Sudeep Holla
2019-01-11 10:41 ` Rafael J. Wysocki
1 sibling, 1 reply; 9+ messages in thread
From: Sudeep Holla @ 2019-01-09 10:59 UTC (permalink / raw)
To: Quentin Perret
Cc: rjw, viresh.kumar, linux-arm-kernel, linux-pm, linux-kernel,
dietmar.eggemann, qais.yousef
On Wed, Jan 09, 2019 at 10:42:36AM +0000, Quentin Perret wrote:
> The scmi-cpufreq driver calls the arch_set_freq_scale() callback on
> frequency changes to provide scale-invariant load-tracking signals to
> the scheduler. However, in the slow path, it does so while specifying
> the current and max frequencies in different units, hence resulting in a
> broken freq_scale factor.
>
> Fix this by passing all frequencies in KHz, as stored in the CPUFreq
> frequency table.
>
> Fixes: 99d6bdf33877 ("cpufreq: add support for CPU DVFS based on SCMI
> message protocol")
Good find.
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
--
Regards,
Sudeep
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] cpufreq: scmi: Fix frequency invariance in slow path
2019-01-09 10:59 ` Sudeep Holla
@ 2019-01-11 10:41 ` Rafael J. Wysocki
0 siblings, 0 replies; 9+ messages in thread
From: Rafael J. Wysocki @ 2019-01-11 10:41 UTC (permalink / raw)
To: Sudeep Holla, Quentin Perret
Cc: viresh.kumar, linux-arm-kernel, linux-pm, linux-kernel,
dietmar.eggemann, qais.yousef
On Wednesday, January 9, 2019 11:59:45 AM CET Sudeep Holla wrote:
> On Wed, Jan 09, 2019 at 10:42:36AM +0000, Quentin Perret wrote:
> > The scmi-cpufreq driver calls the arch_set_freq_scale() callback on
> > frequency changes to provide scale-invariant load-tracking signals to
> > the scheduler. However, in the slow path, it does so while specifying
> > the current and max frequencies in different units, hence resulting in a
> > broken freq_scale factor.
> >
> > Fix this by passing all frequencies in KHz, as stored in the CPUFreq
> > frequency table.
> >
> > Fixes: 99d6bdf33877 ("cpufreq: add support for CPU DVFS based on SCMI
> > message protocol")
>
> Good find.
>
> Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-01-11 10:41 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-09 10:42 [PATCH] cpufreq: scmi: Fix frequency invariance in slow path Quentin Perret
2019-01-09 10:45 ` Viresh Kumar
2019-01-09 10:56 ` Rafael J. Wysocki
2019-01-09 10:59 ` Quentin Perret
2019-01-09 11:03 ` Rafael J. Wysocki
2019-01-09 11:07 ` Quentin Perret
2019-01-09 10:59 ` Viresh Kumar
2019-01-09 10:59 ` Sudeep Holla
2019-01-11 10:41 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).