Skip to content

Commit 9924fbb

Browse files
ionela-voinescurafaeljw
authored andcommitted
arch_topology: obtain cpu capacity using information from CPPC
Define topology_init_cpu_capacity_cppc() to use highest performance values from _CPC objects to obtain and set maximum capacity information for each CPU. acpi_cppc_processor_probe() is a good point at which to trigger the initialization of CPU (u-arch) capacity values, as at this point the highest performance values can be obtained from each CPU's _CPC objects. Architectures can therefore use this functionality through arch_init_invariance_cppc(). The performance scale used by CPPC is a unified scale for all CPUs in the system. Therefore, by obtaining the raw highest performance values from the _CPC objects, and normalizing them on the [0, 1024] capacity scale, used by the task scheduler, we obtain the CPU capacity of each CPU. While an ACPI Notify(0x85) could alert about a change in the highest performance value, which should in turn retrigger the CPU capacity computations, this notification is not currently handled by the ACPI processor driver. When supported, a call to arch_init_invariance_cppc() would perform the update. Signed-off-by: Ionela Voinescu <ionela.voinescu@arm.com> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Tested-by: Valentin Schneider <valentin.schneider@arm.com> Tested-by: Yicong Yang <yangyicong@hisilicon.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 1132e6d commit 9924fbb

2 files changed

Lines changed: 46 additions & 3 deletions

File tree

drivers/base/arch_topology.c

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,46 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)
339339
return !ret;
340340
}
341341

342+
#ifdef CONFIG_ACPI_CPPC_LIB
343+
#include <acpi/cppc_acpi.h>
344+
345+
void topology_init_cpu_capacity_cppc(void)
346+
{
347+
struct cppc_perf_caps perf_caps;
348+
int cpu;
349+
350+
if (likely(acpi_disabled || !acpi_cpc_valid()))
351+
return;
352+
353+
raw_capacity = kcalloc(num_possible_cpus(), sizeof(*raw_capacity),
354+
GFP_KERNEL);
355+
if (!raw_capacity)
356+
return;
357+
358+
for_each_possible_cpu(cpu) {
359+
if (!cppc_get_perf_caps(cpu, &perf_caps) &&
360+
(perf_caps.highest_perf >= perf_caps.nominal_perf) &&
361+
(perf_caps.highest_perf >= perf_caps.lowest_perf)) {
362+
raw_capacity[cpu] = perf_caps.highest_perf;
363+
pr_debug("cpu_capacity: CPU%d cpu_capacity=%u (raw).\n",
364+
cpu, raw_capacity[cpu]);
365+
continue;
366+
}
367+
368+
pr_err("cpu_capacity: CPU%d missing/invalid highest performance.\n", cpu);
369+
pr_err("cpu_capacity: partial information: fallback to 1024 for all CPUs\n");
370+
goto exit;
371+
}
372+
373+
topology_normalize_cpu_scale();
374+
schedule_work(&update_topology_flags_work);
375+
pr_debug("cpu_capacity: cpu_capacity initialization done\n");
376+
377+
exit:
378+
free_raw_capacity();
379+
}
380+
#endif
381+
342382
#ifdef CONFIG_CPU_FREQ
343383
static cpumask_var_t cpus_to_visit;
344384
static void parsing_done_workfn(struct work_struct *work);
@@ -387,9 +427,8 @@ static int __init register_cpufreq_notifier(void)
387427
int ret;
388428

389429
/*
390-
* on ACPI-based systems we need to use the default cpu capacity
391-
* until we have the necessary code to parse the cpu capacity, so
392-
* skip registering cpufreq notifier.
430+
* On ACPI-based systems skip registering cpufreq notifier as cpufreq
431+
* information is not needed for cpu capacity initialization.
393432
*/
394433
if (!acpi_disabled || !raw_capacity)
395434
return -EINVAL;

include/linux/arch_topology.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
void topology_normalize_cpu_scale(void);
1212
int topology_update_cpu_topology(void);
1313

14+
#ifdef CONFIG_ACPI_CPPC_LIB
15+
void topology_init_cpu_capacity_cppc(void);
16+
#endif
17+
1418
struct device_node;
1519
bool topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu);
1620

0 commit comments

Comments
 (0)