* [PATCH] cpufreq: powernv: Add boost files to export ultra-turbo frequencies
@ 2016-12-16 11:13 Shilpasri G Bhat
2016-12-23 4:29 ` Gautham R Shenoy
0 siblings, 1 reply; 2+ messages in thread
From: Shilpasri G Bhat @ 2016-12-16 11:13 UTC (permalink / raw)
To: rjw, viresh.kumar
Cc: ego, akshay.adiga, linux-pm, linux-kernel, linuxppc-dev, svaidy,
Shilpasri G Bhat
In P8+, Workload Optimized Frequency(WOF) provides the capability to
boost the cpu frequency based on the utilization of the other cpus
running in the chip. The On-Chip-Controller(OCC) firmware will control
the achievability of these frequencies depending on the power headroom
available in the chip. Currently the ultra-turbo frequencies provided
by this feature are exported along with the turbo and sub-turbo
frequencies as scaling_available_frequencies. This patch will export
the ultra-turbo frequencies separately as scaling_boost_frequencies in
WOF enabled systems. This patch will add the boost sysfs file which
can be used to disable/enable ultra-turbo frequencies.
Signed-off-by: Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com>
---
drivers/cpufreq/powernv-cpufreq.c | 48 ++++++++++++++++++++++++++++++++++++---
1 file changed, 45 insertions(+), 3 deletions(-)
diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
index 37671b5..56dfd91 100644
--- a/drivers/cpufreq/powernv-cpufreq.c
+++ b/drivers/cpufreq/powernv-cpufreq.c
@@ -144,6 +144,7 @@ enum throttle_reason_type {
unsigned int max;
unsigned int nominal;
unsigned int nr_pstates;
+ bool wof_enabled;
} powernv_pstate_info;
/* Use following macros for conversions between pstate_id and index */
@@ -203,6 +204,7 @@ static int init_powernv_pstates(void)
const __be32 *pstate_ids, *pstate_freqs;
u32 len_ids, len_freqs;
u32 pstate_min, pstate_max, pstate_nominal;
+ u32 pstate_turbo, pstate_ultra_turbo;
power_mgt = of_find_node_by_path("/ibm,opal/power-mgt");
if (!power_mgt) {
@@ -225,6 +227,25 @@ static int init_powernv_pstates(void)
pr_warn("ibm,pstate-nominal not found\n");
return -ENODEV;
}
+
+ if (of_property_read_u32(power_mgt, "ibm,pstate-ultra-turbo",
+ &pstate_ultra_turbo)) {
+ powernv_pstate_info.wof_enabled = false;
+ goto next;
+ }
+
+ if (of_property_read_u32(power_mgt, "ibm,pstate-turbo",
+ &pstate_turbo)) {
+ powernv_pstate_info.wof_enabled = false;
+ goto next;
+ }
+
+ if (pstate_turbo == pstate_ultra_turbo)
+ powernv_pstate_info.wof_enabled = false;
+ else
+ powernv_pstate_info.wof_enabled = true;
+
+next:
pr_info("cpufreq pstate min %d nominal %d max %d\n", pstate_min,
pstate_nominal, pstate_max);
@@ -268,6 +289,13 @@ static int init_powernv_pstates(void)
powernv_pstate_info.nominal = i;
else if (id == pstate_min)
powernv_pstate_info.min = i;
+
+ if (powernv_pstate_info.wof_enabled && id == pstate_turbo) {
+ int j;
+
+ for (j = i - 1; j >= (int)powernv_pstate_info.max; j--)
+ powernv_freqs[j].flags = CPUFREQ_BOOST_FREQ;
+ }
}
/* End of list marker entry */
@@ -305,9 +333,12 @@ static ssize_t cpuinfo_nominal_freq_show(struct cpufreq_policy *policy,
struct freq_attr cpufreq_freq_attr_cpuinfo_nominal_freq =
__ATTR_RO(cpuinfo_nominal_freq);
+#define SCALING_BOOST_FREQS_ATTR_INDEX 2
+
static struct freq_attr *powernv_cpu_freq_attr[] = {
&cpufreq_freq_attr_scaling_available_freqs,
&cpufreq_freq_attr_cpuinfo_nominal_freq,
+ &cpufreq_freq_attr_scaling_boost_freqs,
NULL,
};
@@ -1013,11 +1044,22 @@ static int __init powernv_cpufreq_init(void)
register_reboot_notifier(&powernv_cpufreq_reboot_nb);
opal_message_notifier_register(OPAL_MSG_OCC, &powernv_cpufreq_opal_nb);
+ if (powernv_pstate_info.wof_enabled)
+ powernv_cpufreq_driver.boost_enabled = true;
+ else
+ powernv_cpu_freq_attr[SCALING_BOOST_FREQS_ATTR_INDEX] = NULL;
+
rc = cpufreq_register_driver(&powernv_cpufreq_driver);
- if (!rc)
- return 0;
+ if (rc) {
+ pr_info("Failed to register the cpufreq driver (%d)\n", rc);
+ goto clean_notifiers;
+ }
- pr_info("Failed to register the cpufreq driver (%d)\n", rc);
+ if (powernv_pstate_info.wof_enabled)
+ cpufreq_enable_boost_support();
+
+ return 0;
+clean_notifiers:
unregister_all_notifiers();
clean_chip_info();
out:
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cpufreq: powernv: Add boost files to export ultra-turbo frequencies
2016-12-16 11:13 [PATCH] cpufreq: powernv: Add boost files to export ultra-turbo frequencies Shilpasri G Bhat
@ 2016-12-23 4:29 ` Gautham R Shenoy
0 siblings, 0 replies; 2+ messages in thread
From: Gautham R Shenoy @ 2016-12-23 4:29 UTC (permalink / raw)
To: Shilpasri G Bhat
Cc: rjw, viresh.kumar, ego, akshay.adiga, linux-pm, linux-kernel,
linuxppc-dev, svaidy
Hi Shilpa,
On Fri, Dec 16, 2016 at 04:43:08PM +0530, Shilpasri G Bhat wrote:
> In P8+, Workload Optimized Frequency(WOF) provides the capability to
> boost the cpu frequency based on the utilization of the other cpus
> running in the chip. The On-Chip-Controller(OCC) firmware will control
> the achievability of these frequencies depending on the power headroom
> available in the chip. Currently the ultra-turbo frequencies provided
> by this feature are exported along with the turbo and sub-turbo
> frequencies as scaling_available_frequencies. This patch will export
> the ultra-turbo frequencies separately as scaling_boost_frequencies in
> WOF enabled systems. This patch will add the boost sysfs file which
> can be used to disable/enable ultra-turbo frequencies.
>
> Signed-off-by: Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com>
> ---
> drivers/cpufreq/powernv-cpufreq.c | 48 ++++++++++++++++++++++++++++++++++++---
> 1 file changed, 45 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
> index 37671b5..56dfd91 100644
> --- a/drivers/cpufreq/powernv-cpufreq.c
> +++ b/drivers/cpufreq/powernv-cpufreq.c
> @@ -144,6 +144,7 @@ enum throttle_reason_type {
> unsigned int max;
> unsigned int nominal;
> unsigned int nr_pstates;
> + bool wof_enabled;
> } powernv_pstate_info;
>
> /* Use following macros for conversions between pstate_id and index */
> @@ -203,6 +204,7 @@ static int init_powernv_pstates(void)
> const __be32 *pstate_ids, *pstate_freqs;
> u32 len_ids, len_freqs;
> u32 pstate_min, pstate_max, pstate_nominal;
> + u32 pstate_turbo, pstate_ultra_turbo;
>
> power_mgt = of_find_node_by_path("/ibm,opal/power-mgt");
> if (!power_mgt) {
> @@ -225,6 +227,25 @@ static int init_powernv_pstates(void)
> pr_warn("ibm,pstate-nominal not found\n");
> return -ENODEV;
> }
> +
> + if (of_property_read_u32(power_mgt, "ibm,pstate-ultra-turbo",
> + &pstate_ultra_turbo)) {
> + powernv_pstate_info.wof_enabled = false;
> + goto next;
> + }
> +
> + if (of_property_read_u32(power_mgt, "ibm,pstate-turbo",
> + &pstate_turbo)) {
> + powernv_pstate_info.wof_enabled = false;
> + goto next;
> + }
> +
> + if (pstate_turbo == pstate_ultra_turbo)
> + powernv_pstate_info.wof_enabled = false;
> + else
> + powernv_pstate_info.wof_enabled = true;
> +
> +next:
> pr_info("cpufreq pstate min %d nominal %d max %d\n", pstate_min,
> pstate_nominal, pstate_max);
Could you also print if ultra_turbo is enabled ?
>
> @@ -268,6 +289,13 @@ static int init_powernv_pstates(void)
> powernv_pstate_info.nominal = i;
> else if (id == pstate_min)
> powernv_pstate_info.min = i;
> +
> + if (powernv_pstate_info.wof_enabled && id == pstate_turbo) {
powernv_pstate_info.wof_enabled check is not required since we will
bail out of the loop below as j < powernv_pstate_info.max in case when
turbo = ultra-turbo or if ultra-turbo is not defined.
That said, it makes the code more readable so let us keep it.
> + int j;
> +
> + for (j = i - 1; j >= (int)powernv_pstate_info.max; j--)
> + powernv_freqs[j].flags = CPUFREQ_BOOST_FREQ;
> + }
>
> /* End of list marker entry */
> @@ -305,9 +333,12 @@ static ssize_t cpuinfo_nominal_freq_show(struct cpufreq_policy *policy,
> struct freq_attr cpufreq_freq_attr_cpuinfo_nominal_freq =
> __ATTR_RO(cpuinfo_nominal_freq);
>
> +#define SCALING_BOOST_FREQS_ATTR_INDEX 2
> +
> static struct freq_attr *powernv_cpu_freq_attr[] = {
> &cpufreq_freq_attr_scaling_available_freqs,
> &cpufreq_freq_attr_cpuinfo_nominal_freq,
> + &cpufreq_freq_attr_scaling_boost_freqs,
> NULL,
> };
>
> @@ -1013,11 +1044,22 @@ static int __init powernv_cpufreq_init(void)
> register_reboot_notifier(&powernv_cpufreq_reboot_nb);
> opal_message_notifier_register(OPAL_MSG_OCC, &powernv_cpufreq_opal_nb);
>
> + if (powernv_pstate_info.wof_enabled)
> + powernv_cpufreq_driver.boost_enabled = true;
> + else
> + powernv_cpu_freq_attr[SCALING_BOOST_FREQS_ATTR_INDEX] = NULL;
> +
> rc = cpufreq_register_driver(&powernv_cpufreq_driver);
> - if (!rc)
> - return 0;
> + if (rc) {
> + pr_info("Failed to register the cpufreq driver (%d)\n", rc);
> + goto clean_notifiers;
cleanup_notifiers ?
> + }
>
> - pr_info("Failed to register the cpufreq driver (%d)\n", rc);
> + if (powernv_pstate_info.wof_enabled)
> + cpufreq_enable_boost_support();
> +
> + return 0;
> +clean_notifiers:
> unregister_all_notifiers();
> clean_chip_info();
> out:
> --
> 1.8.3.1
>
Looks good otherwise.
Reviewed-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-12-23 4:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-16 11:13 [PATCH] cpufreq: powernv: Add boost files to export ultra-turbo frequencies Shilpasri G Bhat
2016-12-23 4:29 ` Gautham R Shenoy
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).