Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

arm: perf: move event map macros to pmu.h 



A few PMU-related macros are now looking a little lonely in
asm/perf_event.h now that all other PMU-specific structs, function
prototypes and macros live in pmu.h.

So as to make their placement consistent and to make it easier to build
atop of the current PMU functionality, let's reunite the entire family in
pmu.h

Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Tested-by: default avatarChristopher Covington <cov@codeaurora.org>
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 4c834452

arch/arm/include/asm/perf_event.h

+0 −9
Original line number Diff line number Diff line
@@ -12,15 +12,6 @@ 
#ifndef __ARM_PERF_EVENT_H__

#define __ARM_PERF_EVENT_H__



/*

 * The ARMv7 CPU PMU supports up to 32 event counters.

 */

#define ARMPMU_MAX_HWEVENTS		32



#define HW_OP_UNSUPPORTED		0xFFFF

#define C(_x)				PERF_COUNT_HW_CACHE_##_x

#define CACHE_OP_UNSUPPORTED		0xFFFF



#ifdef CONFIG_HW_PERF_EVENTS

struct pt_regs;

extern unsigned long perf_instruction_pointer(struct pt_regs *regs);

arch/arm/include/asm/pmu.h

+9 −0
Original line number Diff line number Diff line
@@ -42,6 +42,15 @@ struct arm_pmu_platdata { 


#ifdef CONFIG_HW_PERF_EVENTS



/*

 * The ARMv7 CPU PMU supports up to 32 event counters.

 */

#define ARMPMU_MAX_HWEVENTS		32



#define HW_OP_UNSUPPORTED		0xFFFF

#define C(_x)				PERF_COUNT_HW_CACHE_##_x

#define CACHE_OP_UNSUPPORTED		0xFFFF



/* The events for a given PMU register set. */

struct pmu_hw_events {

	/*