Commit 71143277 authored by Zaid Al-Bassam's avatar Zaid Al-Bassam Committed by Will Deacon
Browse files

perf: pmuv3: Abstract PMU version checks 



The current PMU version definitions are available for arm64 only,
As we want to add PMUv3 support to arm (32-bit), abstracts
these definitions by using arch-specific helpers.

Signed-off-by: default avatarZaid Al-Bassam <zalbassam@google.com>
Tested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20230317195027.3746949-4-zalbassam@google.com


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

arch/arm64/include/asm/arm_pmuv3.h

+16 −0
Original line number Diff line number Diff line
@@ -134,4 +134,20 @@ static inline u32 read_pmceid1(void) 
	return read_sysreg(pmceid1_el0);

}



static inline bool pmuv3_implemented(int pmuver)

{

	return !(pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF ||

		 pmuver == ID_AA64DFR0_EL1_PMUVer_NI);

}



static inline bool is_pmuv3p4(int pmuver)

{

	return pmuver >= ID_AA64DFR0_EL1_PMUVer_V3P4;

}



static inline bool is_pmuv3p5(int pmuver)

{

	return pmuver >= ID_AA64DFR0_EL1_PMUVer_V3P5;

}



#endif

drivers/perf/arm_pmuv3.c

+3 −4
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static const struct attribute_group armv8_pmuv3_caps_attr_group = { 
 */

static bool armv8pmu_has_long_event(struct arm_pmu *cpu_pmu)

{

	return (cpu_pmu->pmuver >= ID_AA64DFR0_EL1_PMUVer_V3P5);

	return (is_pmuv3p5(cpu_pmu->pmuver));

}



static inline bool armv8pmu_event_has_user_read(struct perf_event *event)
@@ -1084,8 +1084,7 @@ static void __armv8pmu_probe_pmu(void *info) 
	int pmuver;



	pmuver = read_pmuver();

	if (pmuver == ID_AA64DFR0_EL1_PMUVer_IMP_DEF ||

	    pmuver == ID_AA64DFR0_EL1_PMUVer_NI)

	if (!pmuv3_implemented(pmuver))

		return;



	cpu_pmu->pmuver = pmuver;
@@ -1111,7 +1110,7 @@ static void __armv8pmu_probe_pmu(void *info) 
			     pmceid, ARMV8_PMUV3_MAX_COMMON_EVENTS);



	/* store PMMIR register for sysfs */

	if (pmuver >= ID_AA64DFR0_EL1_PMUVer_V3P4 && (pmceid_raw[1] & BIT(31)))

	if (is_pmuv3p4(pmuver) && (pmceid_raw[1] & BIT(31)))

		cpu_pmu->reg_pmmir = read_pmmir();

	else

		cpu_pmu->reg_pmmir = 0;