Commit de902d96 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar

x86, perf: P4 PMU -- configure predefined events

If an event is not RAW we should not exit p4_hw_config
early but call x86_setup_perfctr as well.
Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Lin Ming <ming.m.lin@intel.com>
Cc: Robert Richter <robert.richter@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6e85158c
...@@ -439,9 +439,7 @@ static int p4_hw_config(struct perf_event *event) ...@@ -439,9 +439,7 @@ static int p4_hw_config(struct perf_event *event)
if (p4_ht_active() && p4_ht_thread(cpu)) if (p4_ht_active() && p4_ht_thread(cpu))
event->hw.config = p4_set_ht_bit(event->hw.config); event->hw.config = p4_set_ht_bit(event->hw.config);
if (event->attr.type != PERF_TYPE_RAW) if (event->attr.type == PERF_TYPE_RAW) {
return 0;
/* /*
* We don't control raw events so it's up to the caller * We don't control raw events so it's up to the caller
* to pass sane values (and we don't count the thread number * to pass sane values (and we don't count the thread number
...@@ -454,6 +452,7 @@ static int p4_hw_config(struct perf_event *event) ...@@ -454,6 +452,7 @@ static int p4_hw_config(struct perf_event *event)
event->hw.config |= event->attr.config & event->hw.config |= event->attr.config &
(p4_config_pack_escr(P4_ESCR_MASK_HT) | (p4_config_pack_escr(P4_ESCR_MASK_HT) |
p4_config_pack_cccr(P4_CCCR_MASK_HT)); p4_config_pack_cccr(P4_CCCR_MASK_HT));
}
return x86_setup_perfctr(event); return x86_setup_perfctr(event);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment