Commit 68c5debc authored by Ionela Voinescu's avatar Ionela Voinescu Committed by Catalin Marinas

arm64: implement CPPC FFH support using AMUs

If Activity Monitors (AMUs) are present, two of the counters can be used
to implement support for CPPC's (Collaborative Processor Performance
Control) delivered and reference performance monitoring functionality
using FFH (Functional Fixed Hardware).

Given that counters for a certain CPU can only be read from that CPU,
while FFH operations can be called from any CPU for any of the CPUs, use
smp_call_function_single() to provide the requested values.

Therefore, depending on the register addresses, the following values
are returned:
 - 0x0 (DeliveredPerformanceCounterRegister): AMU core counter
 - 0x1 (ReferencePerformanceCounterRegister): AMU constant counter

The use of Activity Monitors is hidden behind the generic
cpu_read_{corecnt,constcnt}() functions.

Read functionality for these two registers represents the only current
FFH support for CPPC. Read operations for other register values or write
operation for all registers are unsupported. Therefore, keep CPPC's FFH
unsupported if no CPUs have valid AMU frequency counters. For this
purpose, the get_cpu_with_amu_feat() is introduced.
Signed-off-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Reviewed-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20201106125334.21570-4-ionela.voinescu@arm.comSigned-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent bc3b6562
...@@ -772,6 +772,9 @@ static inline bool cpu_has_amu_feat(int cpu) ...@@ -772,6 +772,9 @@ static inline bool cpu_has_amu_feat(int cpu)
} }
#endif #endif
/* Get a cpu that supports the Activity Monitors Unit (AMU) */
extern int get_cpu_with_amu_feat(void);
static inline unsigned int get_vmid_bits(u64 mmfr1) static inline unsigned int get_vmid_bits(u64 mmfr1)
{ {
int vmid_bits; int vmid_bits;
......
...@@ -1526,6 +1526,11 @@ bool cpu_has_amu_feat(int cpu) ...@@ -1526,6 +1526,11 @@ bool cpu_has_amu_feat(int cpu)
return cpumask_test_cpu(cpu, &amu_cpus); return cpumask_test_cpu(cpu, &amu_cpus);
} }
int get_cpu_with_amu_feat(void)
{
return cpumask_any(&amu_cpus);
}
static void cpu_amu_enable(struct arm64_cpu_capabilities const *cap) static void cpu_amu_enable(struct arm64_cpu_capabilities const *cap)
{ {
if (has_cpuid_feature(cap, SCOPE_LOCAL_CPU)) { if (has_cpuid_feature(cap, SCOPE_LOCAL_CPU)) {
...@@ -1554,6 +1559,11 @@ static bool has_amu(const struct arm64_cpu_capabilities *cap, ...@@ -1554,6 +1559,11 @@ static bool has_amu(const struct arm64_cpu_capabilities *cap,
return true; return true;
} }
#else
int get_cpu_with_amu_feat(void)
{
return nr_cpu_ids;
}
#endif #endif
#ifdef CONFIG_ARM64_VHE #ifdef CONFIG_ARM64_VHE
......
...@@ -147,6 +147,9 @@ void update_freq_counters_refs(void) ...@@ -147,6 +147,9 @@ void update_freq_counters_refs(void)
static inline bool freq_counters_valid(int cpu) static inline bool freq_counters_valid(int cpu)
{ {
if ((cpu >= nr_cpu_ids) || !cpumask_test_cpu(cpu, cpu_present_mask))
return false;
if (!cpu_has_amu_feat(cpu)) { if (!cpu_has_amu_feat(cpu)) {
pr_debug("CPU%d: counters are not supported.\n", cpu); pr_debug("CPU%d: counters are not supported.\n", cpu);
return false; return false;
...@@ -323,3 +326,64 @@ void topology_scale_freq_tick(void) ...@@ -323,3 +326,64 @@ void topology_scale_freq_tick(void)
this_cpu_write(arch_core_cycles_prev, core_cnt); this_cpu_write(arch_core_cycles_prev, core_cnt);
this_cpu_write(arch_const_cycles_prev, const_cnt); this_cpu_write(arch_const_cycles_prev, const_cnt);
} }
#ifdef CONFIG_ACPI_CPPC_LIB
#include <acpi/cppc_acpi.h>
static void cpu_read_corecnt(void *val)
{
*(u64 *)val = read_corecnt();
}
static void cpu_read_constcnt(void *val)
{
*(u64 *)val = read_constcnt();
}
static inline
int counters_read_on_cpu(int cpu, smp_call_func_t func, u64 *val)
{
if (!cpu_has_amu_feat(cpu))
return -EOPNOTSUPP;
smp_call_function_single(cpu, func, val, 1);
return 0;
}
/*
* Refer to drivers/acpi/cppc_acpi.c for the description of the functions
* below.
*/
bool cpc_ffh_supported(void)
{
return freq_counters_valid(get_cpu_with_amu_feat());
}
int cpc_read_ffh(int cpu, struct cpc_reg *reg, u64 *val)
{
int ret = -EOPNOTSUPP;
switch ((u64)reg->address) {
case 0x0:
ret = counters_read_on_cpu(cpu, cpu_read_corecnt, val);
break;
case 0x1:
ret = counters_read_on_cpu(cpu, cpu_read_constcnt, val);
break;
}
if (!ret) {
*val &= GENMASK_ULL(reg->bit_offset + reg->bit_width - 1,
reg->bit_offset);
*val >>= reg->bit_offset;
}
return ret;
}
int cpc_write_ffh(int cpunum, struct cpc_reg *reg, u64 val)
{
return -EOPNOTSUPP;
}
#endif /* CONFIG_ACPI_CPPC_LIB */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment