From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753916AbbJTJhV (ORCPT ); Tue, 20 Oct 2015 05:37:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49904 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753745AbbJTJhR (ORCPT ); Tue, 20 Oct 2015 05:37:17 -0400 Date: Tue, 20 Oct 2015 02:36:33 -0700 From: tip-bot for Stephane Eranian Message-ID: Cc: eranian@google.com, torvalds@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, dsahern@gmail.com, acme@redhat.com, peterz@infradead.org, jolsa@redhat.com, namhyung@kernel.org, vincent.weaver@maine.edu Reply-To: torvalds@linux-foundation.org, tglx@linutronix.de, eranian@google.com, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com, acme@redhat.com, peterz@infradead.org, jolsa@redhat.com, namhyung@kernel.org, vincent.weaver@maine.edu In-Reply-To: <1444720151-10275-4-git-send-email-eranian@google.com> References: <1444720151-10275-4-git-send-email-eranian@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/powerpc: Add support for PERF_SAMPLE_BRANCH_CALL Git-Commit-ID: 24f1a79a5fc10858e05ee0bf651ec99abfc0319b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 24f1a79a5fc10858e05ee0bf651ec99abfc0319b Gitweb: http://git.kernel.org/tip/24f1a79a5fc10858e05ee0bf651ec99abfc0319b Author: Stephane Eranian AuthorDate: Tue, 13 Oct 2015 09:09:10 +0200 Committer: Ingo Molnar CommitDate: Tue, 20 Oct 2015 10:30:54 +0200 perf/powerpc: Add support for PERF_SAMPLE_BRANCH_CALL The patch catches PERF_SAMPLE_BRANCH_CALL because it is not clear whether this is actually supported by the hardware. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra (Intel) Cc: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Jiri Olsa Cc: Linus Torvalds Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Vince Weaver Cc: khandual@linux.vnet.ibm.com Link: http://lkml.kernel.org/r/1444720151-10275-4-git-send-email-eranian@google.com Signed-off-by: Ingo Molnar --- arch/powerpc/perf/power8-pmu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/powerpc/perf/power8-pmu.c b/arch/powerpc/perf/power8-pmu.c index 396351d..7d5e295 100644 --- a/arch/powerpc/perf/power8-pmu.c +++ b/arch/powerpc/perf/power8-pmu.c @@ -676,6 +676,9 @@ static u64 power8_bhrb_filter_map(u64 branch_sample_type) if (branch_sample_type & PERF_SAMPLE_BRANCH_IND_CALL) return -1; + if (branch_sample_type & PERF_SAMPLE_BRANCH_CALL) + return -1; + if (branch_sample_type & PERF_SAMPLE_BRANCH_ANY_CALL) { pmu_bhrb_filter |= POWER8_MMCRA_IFM1; return pmu_bhrb_filter;