From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754448AbbLCVVa (ORCPT ); Thu, 3 Dec 2015 16:21:30 -0500 Received: from mga09.intel.com ([134.134.136.24]:17032 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754008AbbLCVV3 (ORCPT ); Thu, 3 Dec 2015 16:21:29 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,378,1444719600"; d="scan'208";a="699778307" From: Andi Kleen To: peterz@infradead.org Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, Andi Kleen Subject: [PATCH] x86, perf: Fix INST_RETIRED.TOTAL_CYCLES_PS constraint Date: Thu, 3 Dec 2015 13:21:27 -0800 Message-Id: <1449177687-5348-1-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.4.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen The constraint added earlier in "Use INST_RETIRED.TOTAL_CYCLES_PS for cycles:pp for Skylake" had a typo. The event can of course be scheduled on all four counters. So fix the mask. This patch could be merged with the earlier patch. Signed-off-by: Andi Kleen --- arch/x86/kernel/cpu/perf_event_intel_ds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c index 1259065..42d42af 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_ds.c +++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c @@ -725,7 +725,7 @@ struct event_constraint intel_skl_pebs_event_constraints[] = { /* INST_RETIRED.PREC_DIST, inv=1, cmask=16 (cycles:ppp). */ INTEL_FLAGS_EVENT_CONSTRAINT(0x108001c0, 0x2), /* INST_RETIRED.TOTAL_CYCLES_PS (inv=1, cmask=16) (cycles:p). */ - INTEL_FLAGS_EVENT_CONSTRAINT(0x108000c0, 0x01), + INTEL_FLAGS_EVENT_CONSTRAINT(0x108000c0, 0xf), INTEL_PLD_CONSTRAINT(0x1cd, 0xf), /* MEM_TRANS_RETIRED.* */ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x11d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_LOADS */ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x12d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_STORES */ -- 2.4.3