From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753040AbbKBUZq (ORCPT ); Mon, 2 Nov 2015 15:25:46 -0500 Received: from e17.ny.us.ibm.com ([129.33.205.207]:45822 "EHLO e17.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752495AbbKBUZE (ORCPT ); Mon, 2 Nov 2015 15:25:04 -0500 X-IBM-Helo: d01dlp03.pok.ibm.com X-IBM-MailFrom: sukadev@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org From: Sukadev Bhattiprolu To: Michael Ellerman , Arnaldo Carvalho de Melo , mingo@redhat.com, Jiri Olsa Cc: linuxppc-dev@lists.ozlabs.org, Subject: [PATCH 3/4] powerpc/perf: Rename some Power8 events Date: Mon, 2 Nov 2015 12:22:24 -0800 Message-Id: <1446495745-24001-4-git-send-email-sukadev@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1446495745-24001-1-git-send-email-sukadev@linux.vnet.ibm.com> References: <1446495745-24001-1-git-send-email-sukadev@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15110220-0041-0000-0000-000002323D74 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename following events to be consistent with the specs. PM_L1_PREF to PM_LSU_L1_PREF PM_PPC_CMPL to PM_INST_CMPL Signed-off-by: Sukadev Bhattiprolu --- arch/powerpc/perf/power8-events-list.h | 2 +- arch/powerpc/perf/power8-pmu.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/perf/power8-events-list.h b/arch/powerpc/perf/power8-events-list.h index 3262e26..69b1a25 100644 --- a/arch/powerpc/perf/power8-events-list.h +++ b/arch/powerpc/perf/power8-events-list.h @@ -21,7 +21,7 @@ EVENT(PM_BR_MPRED_CMPL, 0x400f6) EVENT(PM_LD_REF_L1, 0x100ee) EVENT(PM_LD_MISS_L1, 0x3e054) EVENT(PM_ST_MISS_L1, 0x300f0) -EVENT(PM_L1_PREF, 0x0d8b8) +EVENT(PM_LSU_L1_PREF, 0x0d8b8) EVENT(PM_INST_FROM_L1, 0x04080) EVENT(PM_L1_ICACHE_MISS, 0x200fd) EVENT(PM_L1_DEMAND_WRITE, 0x0408c) diff --git a/arch/powerpc/perf/power8-pmu.c b/arch/powerpc/perf/power8-pmu.c index 11848af..b453eb9 100644 --- a/arch/powerpc/perf/power8-pmu.c +++ b/arch/powerpc/perf/power8-pmu.c @@ -552,11 +552,11 @@ static int power8_get_alternatives(u64 event, unsigned int flags, u64 alt[]) case 0x600f4: /* PM_RUN_CYC */ alt[j++] = 0x1e; break; - case 0x2: /* PM_PPC_CMPL */ + case 0x2: /* PM_INST_CMPL */ alt[j++] = 0x500fa; /* PM_RUN_INST_CMPL */ break; case 0x500fa: /* PM_RUN_INST_CMPL */ - alt[j++] = 0x2; /* PM_PPC_CMPL */ + alt[j++] = 0x2; /* PM_INST_CMPL */ break; } } @@ -709,7 +709,7 @@ static int power8_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = { [ C(RESULT_MISS) ] = PM_ST_MISS_L1, }, [ C(OP_PREFETCH) ] = { - [ C(RESULT_ACCESS) ] = PM_L1_PREF, + [ C(RESULT_ACCESS) ] = PM_LSU_L1_PREF, [ C(RESULT_MISS) ] = 0, }, }, -- 2.5.3