Commit fd264b31 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Will Deacon
Browse files

arm64/perf: Replace '0xf' instances with ID_AA64DFR0_PMUVER_IMP_DEF 



ID_AA64DFR0_PMUVER_IMP_DEF, indicating an "implementation defined" PMU,
never actually gets used although there are '0xf' instances scattered
all around. Use the symbolic name instead of the raw hex constant.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/1628652427-24695-2-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent ff117646

arch/arm64/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ cpuid_feature_cap_perfmon_field(u64 features, int field, u64 cap) 
	u64 mask = GENMASK_ULL(field + 3, field);



	/* Treat IMPLEMENTATION DEFINED functionality as unimplemented */

	if (val == 0xf)

	if (val == ID_AA64DFR0_PMUVER_IMP_DEF)

		val = 0;



	if (val > cap) {

arch/arm64/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ static void __armv8pmu_probe_pmu(void *info) 
	dfr0 = read_sysreg(id_aa64dfr0_el1);

	pmuver = cpuid_feature_extract_unsigned_field(dfr0,

			ID_AA64DFR0_PMUVER_SHIFT);

	if (pmuver == 0xf || pmuver == 0)

	if (pmuver == ID_AA64DFR0_PMUVER_IMP_DEF || pmuver == 0)

		return;



	cpu_pmu->pmuver = pmuver;