From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751744AbcDTS22 (ORCPT ); Wed, 20 Apr 2016 14:28:28 -0400 Received: from mga14.intel.com ([192.55.52.115]:25122 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751603AbcDTS20 (ORCPT ); Wed, 20 Apr 2016 14:28:26 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,510,1455004800"; d="scan'208";a="936643023" Message-ID: <1461176931.8946.150.camel@linux.intel.com> Subject: Re: [PATCH v4 0/2] Skylake PSys support From: Srinivas Pandruvada To: Peter Zijlstra Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, rjw@rjwysocki.net, x86@kernel.org, bp@alien8.de, linux-kernel@vger.kernel.org, jacob.jun.pan@linux.intel.com, linux-pm@vger.kernel.org Date: Wed, 20 Apr 2016 11:28:51 -0700 In-Reply-To: <20160420135945.GY3448@twins.programming.kicks-ass.net> References: <1460930581-29748-1-git-send-email-srinivas.pandruvada@linux.intel.com> <20160420135945.GY3448@twins.programming.kicks-ass.net> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2 (3.18.5.2-1.fc23) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2016-04-20 at 15:59 +0200, Peter Zijlstra wrote: > On Sun, Apr 17, 2016 at 03:02:59PM -0700, Srinivas Pandruvada wrote: > > > > Skylake processor supports a new set of RAPL registers for > > controlling > > entire SoC instead of just CPU package called PSys. This change > > adds > > support in two sub systems: > > > > x86/perf: Adds basic support for Skylake RAPL and PSys support > > > > powercap/rapl: A new platform domain to the current power capping > > Intel > > RAPL driver. > > > > Srinivas Pandruvada (2): > >   perf/x86/intel/rapl: support Skylake RAPL domains > >   powercap: intel_rapl: PSys support > > > >  arch/x86/events/intel/rapl.c     | 51 +++++++++++++++++++++++++++- > > - > >  arch/x86/include/asm/msr-index.h |  2 ++ > >  drivers/powercap/intel_rapl.c    | 69 > > ++++++++++++++++++++++++++++++++++++++++ > >  3 files changed, 120 insertions(+), 2 deletions(-) > These two patches depend on one another, right? Yes. > Because the first patch > adds the MSR the second patch uses? > > How should we go about merging this? The perf-rapl stuff normally > goes > through tip while the powercap stuff goes through Rafael's tree. Do you want me to only send PERF patch and wait for this to be merged before sending powercap? Thanks, Srinivas