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

Commit d71f11c0 authored by Kan Liang's avatar Kan Liang Committed by Ingo Molnar
Browse files

perf/x86/intel/uncore: Correct fixed counter index check for NHM 



For Nehalem and Westmere, there is only one fixed counter for W-Box.
There is no index which is bigger than UNCORE_PMC_IDX_FIXED.
It is not correct to use >= to check fixed counter.
The code quality issue will bring problem when new counter index is
introduced.

Signed-off-by: default avatarKan Liang <kan.liang@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: acme@kernel.org
Cc: eranian@google.com
Link: http://lkml.kernel.org/r/1525371913-10597-2-git-send-email-kan.liang@intel.com


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

arch/x86/events/intel/uncore_nhmex.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static void nhmex_uncore_msr_enable_event(struct intel_uncore_box *box, struct p 
{

	struct hw_perf_event *hwc = &event->hw;



	if (hwc->idx >= UNCORE_PMC_IDX_FIXED)

	if (hwc->idx == UNCORE_PMC_IDX_FIXED)

		wrmsrl(hwc->config_base, NHMEX_PMON_CTL_EN_BIT0);

	else if (box->pmu->type->event_mask & NHMEX_PMON_CTL_EN_BIT0)

		wrmsrl(hwc->config_base, hwc->config | NHMEX_PMON_CTL_EN_BIT22);