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

Commit c019de3d authored by Vinayak Kale's avatar Vinayak Kale Committed by Catalin Marinas
Browse files

arm64: perf: fix event number mask 



This patch fixes ARMV8_EVTYPE_* macros since evtCount (event number)
field width is 10bits in event selection register.

Signed-off-by: default avatarVinayak Kale <vkale@apm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent a872013d

arch/arm64/kernel/perf_event.c

+4 −3
Original line number Diff line number Diff line
@@ -784,8 +784,8 @@ static const unsigned armv8_pmuv3_perf_cache_map[PERF_COUNT_HW_CACHE_MAX] 
/*

 * PMXEVTYPER: Event selection reg

 */

#define	ARMV8_EVTYPE_MASK	0xc80000ff	/* Mask for writable bits */

#define	ARMV8_EVTYPE_EVENT	0xff		/* Mask for EVENT bits */

#define	ARMV8_EVTYPE_MASK	0xc80003ff	/* Mask for writable bits */

#define	ARMV8_EVTYPE_EVENT	0x3ff		/* Mask for EVENT bits */



/*

 * Event filters for PMUv3
@@ -1175,7 +1175,8 @@ static void armv8pmu_reset(void *info) 
static int armv8_pmuv3_map_event(struct perf_event *event)

{

	return map_cpu_event(event, &armv8_pmuv3_perf_map,

				&armv8_pmuv3_perf_cache_map, 0xFF);

				&armv8_pmuv3_perf_cache_map,

				ARMV8_EVTYPE_EVENT);

}



static struct arm_pmu armv8pmu = {