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

Commit c420f19b authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar
Browse files

perf/x86/intel: Fix Haswell CYCLE_ACTIVITY.* counter constraints 



Some of the CYCLE_ACTIVITY.* events can only be scheduled on
counter 2.  Due to a typo Haswell matched those with
INTEL_EVENT_CONSTRAINT, which lead to the events never
matching as the comparison does not expect anything
in the umask too. Fix the typo.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1425925222-32361-1-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 687805e4

arch/x86/kernel/cpu/perf_event_intel.c

+3 −3
Original line number Diff line number Diff line
@@ -212,11 +212,11 @@ static struct event_constraint intel_hsw_event_constraints[] = { 
	INTEL_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PREC_DIST */

	INTEL_EVENT_CONSTRAINT(0xcd, 0x8), /* MEM_TRANS_RETIRED.LOAD_LATENCY */

	/* CYCLE_ACTIVITY.CYCLES_L1D_PENDING */

	INTEL_EVENT_CONSTRAINT(0x08a3, 0x4),

	INTEL_UEVENT_CONSTRAINT(0x08a3, 0x4),

	/* CYCLE_ACTIVITY.STALLS_L1D_PENDING */

	INTEL_EVENT_CONSTRAINT(0x0ca3, 0x4),

	INTEL_UEVENT_CONSTRAINT(0x0ca3, 0x4),

	/* CYCLE_ACTIVITY.CYCLES_NO_EXECUTE */

	INTEL_EVENT_CONSTRAINT(0x04a3, 0xf),

	INTEL_UEVENT_CONSTRAINT(0x04a3, 0xf),

	EVENT_CONSTRAINT_END

};