From mboxrd@z Thu Jan 1 00:00:00 1970 From: Srinivas Pandruvada Subject: [PATCH v3 1/2] perf/x86/intel/rapl: support Skylake RAPL domains Date: Sun, 20 Mar 2016 16:20:19 -0700 Message-ID: <1458516020-1860-2-git-send-email-srinivas.pandruvada@linux.intel.com> References: <1458516020-1860-1-git-send-email-srinivas.pandruvada@linux.intel.com> Return-path: Received: from mga09.intel.com ([134.134.136.24]:23391 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbcCTXUT (ORCPT ); Sun, 20 Mar 2016 19:20:19 -0400 In-Reply-To: <1458516020-1860-1-git-send-email-srinivas.pandruvada@linux.intel.com> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: tglx@linutronix.de, mingo@redhat.co, hpa@zytor.com, rjw@rjwysocki.net Cc: bp@alien8.de, ak@linux.intel.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, jacob.jun.pan@linux.intel.com, x86@kernel.org, Srinivas Pandruvada Added Skylake support for RAPL domains. In addition to RAPL domains in Broadwell clients, it has support for platform domain (aka PSys). Also fixed error in comment for gpu counter, which previously was dram counter. Signed-off-by: Srinivas Pandruvada --- arch/x86/events/intel/rapl.c | 50 ++++++++++++++++++++++++++++++++++++++-- arch/x86/include/asm/msr-index.h | 2 ++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index b834a3f..69904e7 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -27,10 +27,14 @@ * event: rapl_energy_dram * perf code: 0x3 * - * dram counter: consumption of the builtin-gpu domain (client only) + * gpu counter: consumption of the builtin-gpu domain (client only) * event: rapl_energy_gpu * perf code: 0x4 * + * psys counter: consumption of the builtin-psys domain (client only) + * event: rapl_energy_psys + * perf code: 0x5 + * * We manage those counters as free running (read-only). They may be * use simultaneously by other tools, such as turbostat. * @@ -64,13 +68,16 @@ #define INTEL_RAPL_RAM 0x3 /* pseudo-encoding */ #define RAPL_IDX_PP1_NRG_STAT 3 /* gpu */ #define INTEL_RAPL_PP1 0x4 /* pseudo-encoding */ +#define RAPL_IDX_PSYS_NRG_STAT 4 /* psys */ +#define INTEL_RAPL_PSYS 0x5 /* pseudo-encoding */ -#define NR_RAPL_DOMAINS 0x4 +#define NR_RAPL_DOMAINS 0x5 static const char *const rapl_domain_names[NR_RAPL_DOMAINS] __initconst = { "pp0-core", "package", "dram", "pp1-gpu", + "psys", }; /* Clients have PP0, PKG */ @@ -89,6 +96,13 @@ static const char *const rapl_domain_names[NR_RAPL_DOMAINS] __initconst = { 1<