From: Kan Liang <kan.li...@linux.intel.com>

TOPDOWN.SLOTS(0x0400) is not a generic event. It is only available on
fixed counter3.

Don't extend its mask to generic counters.

Signed-off-by: Kan Liang <kan.li...@linux.intel.com>
---

Changes since V3:
- Separate fixed counter3 definition patch

 arch/x86/events/intel/core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 43c966d1208e..f0208ee554fc 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -5106,12 +5106,14 @@ __init int intel_pmu_init(void)
 
        if (x86_pmu.event_constraints) {
                /*
-                * event on fixed counter2 (REF_CYCLES) only works on this
+                * event on fixed counter2 (REF_CYCLES) and
+                * fixed counter3 (TOPDOWN.SLOTS) only work on this
                 * counter, so do not extend mask to generic counters
                 */
                for_each_event_constraint(c, x86_pmu.event_constraints) {
                        if (c->cmask == FIXED_EVENT_FLAGS
-                           && c->idxmsk64 != INTEL_PMC_MSK_FIXED_REF_CYCLES) {
+                           && c->idxmsk64 != INTEL_PMC_MSK_FIXED_REF_CYCLES
+                           && c->idxmsk64 != INTEL_PMC_MSK_FIXED_SLOTS) {
                                c->idxmsk64 |= (1ULL << x86_pmu.num_counters) - 
1;
                        }
                        c->idxmsk64 &=
-- 
2.17.1

Reply via email to