diff options
| author |   Kan Liang <kan.liang@intel.com> | 2018-05-03 11:25:08 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2018-05-31 12:36:28 +0200 |
| commit | 4749f8196452eeb73cf2086a6a9705bae479d33d (patch) | |
| tree | 6b73fcb7e5ca0ffbc5cd6649163c5a33eaadb313 /arch | |
| parent | perf/x86/intel/uncore: Correct fixed counter index check for NHM (diff) | |
| download | linux-dev-4749f8196452eeb73cf2086a6a9705bae479d33d.tar.xz linux-dev-4749f8196452eeb73cf2086a6a9705bae479d33d.zip | |
perf/x86/intel/uncore: Correct fixed counter index check in generic code
There is no index which is bigger than UNCORE_PMC_IDX_FIXED. The only
exception is client IMC uncore, which has been specially handled.
For generic code, it is not correct to use >= to check fixed counter.
The code quality issue will bring problem when a new counter index is
introduced.
Signed-off-by: Kan Liang <kan.liang@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Thomas 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-3-git-send-email-kan.liang@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/events/intel/uncore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index a7956fc7ca1d..3b0f93eb3cc0 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -218,7 +218,7 @@ void uncore_perf_event_update(struct intel_uncore_box *box, struct perf_event *e u64 prev_count, new_count, delta; int shift; - if (event->hw.idx >= UNCORE_PMC_IDX_FIXED) + if (event->hw.idx == UNCORE_PMC_IDX_FIXED) shift = 64 - uncore_fixed_ctr_bits(box); else shift = 64 - uncore_perf_ctr_bits(box); |