Skip to content

Commit d71f11c

Browse files
kliang2Ingo Molnar
authored andcommitted
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: Kan Liang <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 2da3314 commit d71f11c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/events/intel/uncore_nhmex.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ static void nhmex_uncore_msr_enable_event(struct intel_uncore_box *box, struct p
246246
{
247247
struct hw_perf_event *hwc = &event->hw;
248248

249-
if (hwc->idx >= UNCORE_PMC_IDX_FIXED)
249+
if (hwc->idx == UNCORE_PMC_IDX_FIXED)
250250
wrmsrl(hwc->config_base, NHMEX_PMON_CTL_EN_BIT0);
251251
else if (box->pmu->type->event_mask & NHMEX_PMON_CTL_EN_BIT0)
252252
wrmsrl(hwc->config_base, hwc->config | NHMEX_PMON_CTL_EN_BIT22);

0 commit comments

Comments
 (0)