From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
To: mingo@redhat.com, tglx@linutronix.de, hpa@zytor.com,
rjw@rjwysocki.net, peterz@infradead.org
Cc: x86@kernel.org, bp@suse.de, sudeep.holla@arm.com,
ak@linux.intel.com, linux-acpi@vger.kernel.org,
linux-pm@vger.kernel.org, alexey.klimov@arm.com,
viresh.kumar@linaro.org, akpm@linux-foundation.org,
linux-kernel@vger.kernel.org, lenb@kernel.org,
tim.c.chen@linux.intel.com, srinivas.pandruvada@linux.intel.com,
paul.gortmaker@windriver.com, jpoimboe@redhat.com,
mcgrof@kernel.org, jgross@suse.com, robert.moore@intel.com,
dvyukov@google.com, jeyu@redhat.com
Subject: [PATCH 11/11] cpufreq: intel_pstate: Use CPPC to get max performance
Date: Thu, 18 Aug 2016 15:36:52 -0700 [thread overview]
Message-ID: <1471559812-19967-12-git-send-email-srinivas.pandruvada@linux.intel.com> (raw)
In-Reply-To: <1471559812-19967-1-git-send-email-srinivas.pandruvada@linux.intel.com>
This change uses acpi cppc_lib interface to get CPPC performance limits.
Once CPPC limits of all online cores are read, first check if there is
difference in max performance. If there is a difference, then the
scheduler interface is called to update per cpu priority. After updating
priority of all current cpus, the itmt feature is enabled.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/cpufreq/Kconfig.x86 | 1 +
drivers/cpufreq/intel_pstate.c | 75 ++++++++++++++++++++++++++++++++++++++++--
2 files changed, 73 insertions(+), 3 deletions(-)
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
index adbd1de..6c4f747 100644
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
@@ -6,6 +6,7 @@ config X86_INTEL_PSTATE
bool "Intel P state control"
depends on X86
select ACPI_PROCESSOR if ACPI
+ select ACPI_CPPC_LIB if ACPI
help
This driver provides a P state for Intel core processors.
The driver implements an internal governor and will become
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index be9eade..c51b9c7 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -44,6 +44,7 @@
#ifdef CONFIG_ACPI
#include <acpi/processor.h>
+#include <acpi/cppc_acpi.h>
#endif
#define FRAC_BITS 8
@@ -193,6 +194,8 @@ struct _pid {
* @sample: Storage for storing last Sample data
* @acpi_perf_data: Stores ACPI perf information read from _PSS
* @valid_pss_table: Set to true for valid ACPI _PSS entries found
+ * @cppc_data: Stores CPPC information for HWP capable CPUs
+ * @valid_cppc_table: Set to true for valid CPPC entries are found
*
* This structure stores per CPU instance data for all CPUs.
*/
@@ -215,6 +218,8 @@ struct cpudata {
#ifdef CONFIG_ACPI
struct acpi_processor_performance acpi_perf_data;
bool valid_pss_table;
+ struct cppc_cpudata *cppc_data;
+ bool valid_cppc_table;
#endif
};
@@ -361,6 +366,15 @@ static struct perf_limits *limits = &powersave_limits;
#endif
#ifdef CONFIG_ACPI
+static cpumask_t cppc_rd_cpu_mask;
+
+/* Call set_sched_itmt from a work function to be able to use hotplug locks */
+static void intel_pstste_sched_itmt_work_fn(struct work_struct *work)
+{
+ set_sched_itmt(true);
+}
+
+static DECLARE_WORK(sched_itmt_work, intel_pstste_sched_itmt_work_fn);
static bool intel_pstate_get_ppc_enable_status(void)
{
@@ -377,14 +391,63 @@ static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)
int ret;
int i;
- if (hwp_active)
+ cpu = all_cpu_data[policy->cpu];
+
+ if (hwp_active) {
+ struct cppc_perf_caps *perf_caps;
+
+ cpu->cppc_data = kzalloc(sizeof(struct cppc_cpudata),
+ GFP_KERNEL);
+ if (!cpu->cppc_data)
+ return;
+
+ perf_caps = &cpu->cppc_data->perf_caps;
+ ret = cppc_get_perf_caps(policy->cpu, perf_caps);
+ if (ret) {
+ kfree(cpu->cppc_data);
+ return;
+ }
+
+ cpu->valid_cppc_table = true;
+ pr_debug("cpu:%d H:0x%x N:0x%x R:0x%x L:0x%x\n", policy->cpu,
+ perf_caps->highest_perf, perf_caps->nominal_perf,
+ perf_caps->reference_perf, perf_caps->lowest_perf);
+
+ cpumask_set_cpu(policy->cpu, &cppc_rd_cpu_mask);
+ if (cpumask_subset(topology_core_cpumask(policy->cpu),
+ &cppc_rd_cpu_mask)) {
+ int cpu_index;
+ int max_prio;
+ bool itmt_support = false;
+
+ cpu = all_cpu_data[0];
+ max_prio = cpu->cppc_data->perf_caps.highest_perf;
+ for_each_cpu(cpu_index, &cppc_rd_cpu_mask) {
+ cpu = all_cpu_data[cpu_index];
+ perf_caps = &cpu->cppc_data->perf_caps;
+ if (max_prio != perf_caps->highest_perf) {
+ itmt_support = true;
+ break;
+ }
+ }
+
+ if (!itmt_support)
+ return;
+
+ for_each_cpu(cpu_index, &cppc_rd_cpu_mask) {
+ cpu = all_cpu_data[cpu_index];
+ perf_caps = &cpu->cppc_data->perf_caps;
+ sched_set_itmt_core_prio(
+ perf_caps->highest_perf, cpu_index);
+ }
+ schedule_work(&sched_itmt_work);
+ }
return;
+ }
if (!intel_pstate_get_ppc_enable_status())
return;
- cpu = all_cpu_data[policy->cpu];
-
ret = acpi_processor_register_performance(&cpu->acpi_perf_data,
policy->cpu);
if (ret)
@@ -444,6 +507,12 @@ static void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy)
struct cpudata *cpu;
cpu = all_cpu_data[policy->cpu];
+
+ if (cpu->valid_cppc_table) {
+ cpumask_clear_cpu(policy->cpu, &cppc_rd_cpu_mask);
+ kfree(cpu->cppc_data);
+ }
+
if (!cpu->valid_pss_table)
return;
--
2.7.4
next prev parent reply other threads:[~2016-08-19 1:11 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 22:36 [PATCH 00/11] Support Intel® Turbo Boost Max Technology 3.0 Srinivas Pandruvada
2016-08-18 22:36 ` [PATCH 01/11] sched, cpuset: Add regenerate_sched_domains function to rebuild all sched domains Srinivas Pandruvada
2016-08-22 13:52 ` Morten Rasmussen
2016-08-22 19:51 ` Tim Chen
2016-08-18 22:36 ` [PATCH 02/11] sched, x86: Add SD_ASYM_PACKING flags to x86 cpu topology for cpus supporting Intel Turbo Boost Max Technology Srinivas Pandruvada
2016-08-18 22:36 ` [PATCH 03/11] sched: Extend scheduler's asym packing Srinivas Pandruvada
2016-08-25 11:22 ` Morten Rasmussen
2016-08-25 11:45 ` Peter Zijlstra
2016-08-25 13:18 ` Morten Rasmussen
2016-08-25 13:45 ` Peter Zijlstra
2016-08-26 10:39 ` Morten Rasmussen
2016-08-26 12:42 ` Peter Zijlstra
2016-08-26 17:25 ` Tim Chen
2016-08-26 23:14 ` Tim Chen
2016-08-18 22:36 ` [PATCH 04/11] sched,x86: Enable Turbo Boost Max Technology Srinivas Pandruvada
2016-08-22 9:01 ` kbuild test robot
2016-08-22 19:04 ` Tim Chen
2016-08-24 10:18 ` Ingo Molnar
2016-08-24 17:50 ` Tim Chen
2016-08-24 18:08 ` Ingo Molnar
2016-08-24 18:22 ` Peter Zijlstra
2016-08-18 22:36 ` [PATCH 05/11] acpi: cppc: Allow build with ACPI_CPU_FREQ_PSS config Srinivas Pandruvada
2016-08-20 0:46 ` Rafael J. Wysocki
2016-08-18 22:36 ` [PATCH 06/11] acpi: cpcc: Add integer read support Srinivas Pandruvada
2016-08-18 22:36 ` [PATCH 07/11] acpi: cppc: Add support for function fixed hardware address Srinivas Pandruvada
2016-08-20 0:49 ` Rafael J. Wysocki
2016-08-18 22:36 ` [PATCH 08/11] acpi: cppc: Add prefix cppc to cpudata structure name Srinivas Pandruvada
2016-08-18 22:36 ` [PATCH 09/11] acpi: bus: Enable HWP CPPC objects Srinivas Pandruvada
2016-08-20 0:49 ` Rafael J. Wysocki
2016-08-18 22:36 ` [PATCH 10/11] acpi: bus: Set _OSC for diverse core support Srinivas Pandruvada
2016-08-20 0:51 ` Rafael J. Wysocki
2016-08-18 22:36 ` Srinivas Pandruvada [this message]
2016-08-22 11:59 ` [PATCH 11/11] cpufreq: intel_pstate: Use CPPC to get max performance kbuild test robot
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=1471559812-19967-12-git-send-email-srinivas.pandruvada@linux.intel.com \
--to=srinivas.pandruvada@linux.intel.com \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=alexey.klimov@arm.com \
--cc=bp@suse.de \
--cc=dvyukov@google.com \
--cc=hpa@zytor.com \
--cc=jeyu@redhat.com \
--cc=jgross@suse.com \
--cc=jpoimboe@redhat.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=mingo@redhat.com \
--cc=paul.gortmaker@windriver.com \
--cc=peterz@infradead.org \
--cc=rjw@rjwysocki.net \
--cc=robert.moore@intel.com \
--cc=sudeep.holla@arm.com \
--cc=tglx@linutronix.de \
--cc=tim.c.chen@linux.intel.com \
--cc=viresh.kumar@linaro.org \
--cc=x86@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: 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).