From: Viresh Kumar <viresh.kumar@linaro.org>
To: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Cc: rjw@rjwysocki.net, Souvik.Chakravarty@arm.com,
Thanu.Rangarajan@arm.com, Sudeep.Holla@arm.com,
guohanjun@huawei.com, john.garry@huawei.com,
jonathan.cameron@huawei.com, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [RFC PATCH v3 1/2] cpufreq: change '.set_boost' to act on only one policy
Date: Wed, 20 May 2020 10:29:11 +0530 [thread overview]
Message-ID: <20200520045911.amww3nm3e7cezcbf@vireshk-i7> (raw)
In-Reply-To: <1589888489-13828-2-git-send-email-wangxiongfeng2@huawei.com>
On 19-05-20, 19:41, Xiongfeng Wang wrote:
> Macro 'for_each_active_policy()' is defined internally. To avoid some
> cpufreq driver needing this macro to iterate over all the policies in
> '.set_boost' callback, we redefine '.set_boost' to act on only one
> policy and pass the policy as an argument.
> 'cpufreq_boost_trigger_state()' iterate over all the policies to set
> boost for the system. This is preparation for adding SW BOOST support
> for CPPC.
>
> Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
> ---
> drivers/cpufreq/acpi-cpufreq.c | 4 ++--
> drivers/cpufreq/cpufreq.c | 53 +++++++++++++++++++++---------------------
> include/linux/cpufreq.h | 2 +-
> 3 files changed, 30 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
> index 289e8ce..b0a9eb5 100644
> --- a/drivers/cpufreq/acpi-cpufreq.c
> +++ b/drivers/cpufreq/acpi-cpufreq.c
> @@ -126,7 +126,7 @@ static void boost_set_msr_each(void *p_en)
> boost_set_msr(enable);
> }
>
> -static int set_boost(int val)
> +static int set_boost(struct cpufreq_policy *policy, int val)
> {
> get_online_cpus();
> on_each_cpu(boost_set_msr_each, (void *)(long)val, 1);
I think (Rafael can confirm), that you need to update this as well. You don't
need to run for each cpu now, but for each CPU in the policy.
> @@ -162,7 +162,7 @@ static ssize_t store_cpb(struct cpufreq_policy *policy, const char *buf,
> if (ret || val > 1)
> return -EINVAL;
>
> - set_boost(val);
> + set_boost(policy, val);
>
> return count;
> }
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index d03f250..d0d86b1 100644
> --- a/drivers/cpufreq/cpufreq.c
> +++ b/drivers/cpufreq/cpufreq.c
> @@ -2532,34 +2532,29 @@ void cpufreq_update_limits(unsigned int cpu)
> /*********************************************************************
> * BOOST *
> *********************************************************************/
> -static int cpufreq_boost_set_sw(int state)
> +static int cpufreq_boost_set_sw(struct cpufreq_policy *policy, int state)
> {
> - struct cpufreq_policy *policy;
> -
> - for_each_active_policy(policy) {
> - int ret;
> -
> - if (!policy->freq_table)
> - return -ENXIO;
> + int ret;
>
> - ret = cpufreq_frequency_table_cpuinfo(policy,
> - policy->freq_table);
> - if (ret) {
> - pr_err("%s: Policy frequency update failed\n",
> - __func__);
> - return ret;
> - }
> + if (!policy->freq_table)
> + return -ENXIO;
>
> - ret = freq_qos_update_request(policy->max_freq_req, policy->max);
> - if (ret < 0)
> - return ret;
> + ret = cpufreq_frequency_table_cpuinfo(policy, policy->freq_table);
> + if (ret) {
> + pr_err("%s: Policy frequency update failed\n", __func__);
> + return ret;
> }
>
> + ret = freq_qos_update_request(policy->max_freq_req, policy->max);
> + if (ret < 0)
> + return ret;
> +
> return 0;
> }
>
> int cpufreq_boost_trigger_state(int state)
> {
> + struct cpufreq_policy *policy;
> unsigned long flags;
> int ret = 0;
>
> @@ -2570,16 +2565,22 @@ int cpufreq_boost_trigger_state(int state)
> cpufreq_driver->boost_enabled = state;
> write_unlock_irqrestore(&cpufreq_driver_lock, flags);
>
> - ret = cpufreq_driver->set_boost(state);
> - if (ret) {
> - write_lock_irqsave(&cpufreq_driver_lock, flags);
> - cpufreq_driver->boost_enabled = !state;
> - write_unlock_irqrestore(&cpufreq_driver_lock, flags);
> -
> - pr_err("%s: Cannot %s BOOST\n",
> - __func__, state ? "enable" : "disable");
> + for_each_active_policy(policy) {
> + ret = cpufreq_driver->set_boost(policy, state);
> + if (ret)
> + goto err_reset_state;
> }
>
> + return 0;
> +
> +err_reset_state:
> + write_lock_irqsave(&cpufreq_driver_lock, flags);
> + cpufreq_driver->boost_enabled = !state;
> + write_unlock_irqrestore(&cpufreq_driver_lock, flags);
> +
> + pr_err("%s: Cannot %s BOOST\n",
> + __func__, state ? "enable" : "disable");
> +
> return ret;
> }
>
> diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
> index 67d5950..3494f67 100644
> --- a/include/linux/cpufreq.h
> +++ b/include/linux/cpufreq.h
> @@ -367,7 +367,7 @@ struct cpufreq_driver {
>
> /* platform specific boost support code */
> bool boost_enabled;
> - int (*set_boost)(int state);
> + int (*set_boost)(struct cpufreq_policy *policy, int state);
> };
>
> /* flags */
> --
> 1.7.12.4
--
viresh
next prev parent reply other threads:[~2020-05-20 4:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 11:41 [RFC PATCH v3 0/2] add SW BOOST support for CPPC Xiongfeng Wang
2020-05-19 11:41 ` [RFC PATCH v3 1/2] cpufreq: change '.set_boost' to act on only one policy Xiongfeng Wang
2020-05-19 11:57 ` Xiongfeng Wang
2020-05-20 4:59 ` Viresh Kumar [this message]
2020-05-20 10:36 ` Rafael J. Wysocki
2020-05-20 10:41 ` Viresh Kumar
2020-05-19 11:41 ` [RFC PATCH v3 2/2] CPPC: add support for SW BOOST Xiongfeng Wang
2020-05-20 5:00 ` Viresh Kumar
2020-05-21 6:25 ` Xiongfeng Wang
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=20200520045911.amww3nm3e7cezcbf@vireshk-i7 \
--to=viresh.kumar@linaro.org \
--cc=Souvik.Chakravarty@arm.com \
--cc=Sudeep.Holla@arm.com \
--cc=Thanu.Rangarajan@arm.com \
--cc=guohanjun@huawei.com \
--cc=john.garry@huawei.com \
--cc=jonathan.cameron@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=wangxiongfeng2@huawei.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).