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

Commit ec2e76b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "Two x86 Intel PMU constraint handling fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Fix Haswell CYCLE_ACTIVITY.* counter constraints
  perf/x86/intel: Filter branches for PEBS event
parents ccc20a33 c420f19b

arch/x86/kernel/cpu/perf_event_intel.c

+5 −5
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

};
@@ -1649,11 +1649,11 @@ intel_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event 
	if (c)

		return c;



	c = intel_pebs_constraints(event);

	c = intel_shared_regs_constraints(cpuc, event);

	if (c)

		return c;



	c = intel_shared_regs_constraints(cpuc, event);

	c = intel_pebs_constraints(event);

	if (c)

		return c;