Commit 548a86ca authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm: perf: make PMU probing data-driven 



The current PMU probing logic consists of a single switch statement,
which means that the core arm_pmu core in perf_event_cpu.c needs to know
about every CPU PMU variant supported by a driver using the arm_pmu
framework. This makes it rather difficult to decouple the drivers from
the (otherwise generic) probing code.

The patch refactors that switch statement to a table-driven lookup,
separating the logic and knowledge (in the form of the table). Later
patches will split the table across the relevant PMU drivers, which can
pass their tables to the generic probing function.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 0f2a2101

arch/arm/include/asm/pmu.h

+23 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include <linux/interrupt.h>

#include <linux/perf_event.h>



#include <asm/cputype.h>



/*

 * struct arm_pmu_platdata - ARM PMU platform data

 *
@@ -127,6 +129,27 @@ int armpmu_map_event(struct perf_event *event, 
						[PERF_COUNT_HW_CACHE_RESULT_MAX],

		     u32 raw_event_mask);



struct pmu_probe_info {

	unsigned int cpuid;

	unsigned int mask;

	int (*init)(struct arm_pmu *);

};



#define PMU_PROBE(_cpuid, _mask, _fn)	\

{					\

	.cpuid = (_cpuid),		\

	.mask = (_mask),		\

	.init = (_fn),			\

}



#define ARM_PMU_PROBE(_cpuid, _fn) \

	PMU_PROBE(_cpuid, ARM_CPU_PART_MASK, _fn)



#define ARM_PMU_XSCALE_MASK	((0xff << 24) | ARM_CPU_XSCALE_ARCH_MASK)



#define XSCALE_PMU_PROBE(_version, _fn) \

	PMU_PROBE(ARM_CPU_IMP_INTEL << 24 | _version, ARM_PMU_XSCALE_MASK, _fn)



#endif /* CONFIG_HW_PERF_EVENTS */



#endif /* __ARM_PMU_H__ */

arch/arm/kernel/perf_event_cpu.c

+18 −32
Original line number Diff line number Diff line
@@ -241,48 +241,34 @@ static struct platform_device_id cpu_pmu_plat_device_ids[] = { 
	{},

};



static const struct pmu_probe_info pmu_probe_table[] = {

	ARM_PMU_PROBE(ARM_CPU_PART_ARM1136, armv6_1136_pmu_init),

	ARM_PMU_PROBE(ARM_CPU_PART_ARM1156, armv6_1156_pmu_init),

	ARM_PMU_PROBE(ARM_CPU_PART_ARM1176, armv6_1176_pmu_init),

	ARM_PMU_PROBE(ARM_CPU_PART_ARM11MPCORE, armv6mpcore_pmu_init),

	ARM_PMU_PROBE(ARM_CPU_PART_CORTEX_A8, armv7_a8_pmu_init),

	ARM_PMU_PROBE(ARM_CPU_PART_CORTEX_A9, armv7_a9_pmu_init),

	XSCALE_PMU_PROBE(ARM_CPU_XSCALE_ARCH_V1, xscale1pmu_init),

	XSCALE_PMU_PROBE(ARM_CPU_XSCALE_ARCH_V2, xscale2pmu_init),

	{ /* sentinel value */ }

};



/*

 * CPU PMU identification and probing.

 */

static int probe_current_pmu(struct arm_pmu *pmu)

{

	int cpu = get_cpu();

	unsigned int cpuid = read_cpuid_id();

	int ret = -ENODEV;

	const struct pmu_probe_info *info;



	pr_info("probing PMU on CPU %d\n", cpu);



	switch (read_cpuid_part()) {

	/* ARM Ltd CPUs. */

	case ARM_CPU_PART_ARM1136:

		ret = armv6_1136_pmu_init(pmu);

		break;

	case ARM_CPU_PART_ARM1156:

		ret = armv6_1156_pmu_init(pmu);

		break;

	case ARM_CPU_PART_ARM1176:

		ret = armv6_1176_pmu_init(pmu);

		break;

	case ARM_CPU_PART_ARM11MPCORE:

		ret = armv6mpcore_pmu_init(pmu);

		break;

	case ARM_CPU_PART_CORTEX_A8:

		ret = armv7_a8_pmu_init(pmu);

		break;

	case ARM_CPU_PART_CORTEX_A9:

		ret = armv7_a9_pmu_init(pmu);

		break;



	default:

		if (read_cpuid_implementor() == ARM_CPU_IMP_INTEL) {

			switch (xscale_cpu_arch_version()) {

			case ARM_CPU_XSCALE_ARCH_V1:

				ret = xscale1pmu_init(pmu);

				break;

			case ARM_CPU_XSCALE_ARCH_V2:

				ret = xscale2pmu_init(pmu);

				break;

			}

		}

	for (info = pmu_probe_table; info->init != NULL; info++) {

		if ((cpuid & info->mask) != info->cpuid)

			continue;

		ret = info->init(pmu);

		break;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE