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

Commit d329527e authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf, x86: Reorder intel_pmu_enable_all() 



The documentation says we have to enable PEBS before we enable the PMU
proper.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: paulus@samba.org
Cc: eranian@google.com
Cc: robert.richter@amd.com
Cc: fweisbec@gmail.com
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2df202bf

arch/x86/kernel/cpu/perf_event_intel.c

+2 −3
Original line number Diff line number Diff line
@@ -487,6 +487,8 @@ static void intel_pmu_enable_all(void) 
{

	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);



	intel_pmu_pebs_enable_all();

	intel_pmu_lbr_enable_all();

	wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, x86_pmu.intel_ctrl);



	if (test_bit(X86_PMC_IDX_FIXED_BTS, cpuc->active_mask)) {
@@ -498,9 +500,6 @@ static void intel_pmu_enable_all(void) 


		intel_pmu_enable_bts(event->hw.config);

	}



	intel_pmu_pebs_enable_all();

	intel_pmu_lbr_enable_all();

}



static inline u64 intel_pmu_get_status(void)