From patchwork Tue Jun 14 14:47:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Pan X-Patchwork-Id: 9176019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B41286075D for ; Tue, 14 Jun 2016 14:49:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5A571FEC1 for ; Tue, 14 Jun 2016 14:49:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A36D2012F; Tue, 14 Jun 2016 14:49:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 675F222473 for ; Tue, 14 Jun 2016 14:49:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751324AbcFNOtW (ORCPT ); Tue, 14 Jun 2016 10:49:22 -0400 Received: from mga02.intel.com ([134.134.136.20]:29573 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751256AbcFNOtT (ORCPT ); Tue, 14 Jun 2016 10:49:19 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 14 Jun 2016 07:49:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,470,1459839600"; d="scan'208";a="975435100" Received: from icelake.jf.intel.com (HELO icelake) ([10.7.199.88]) by orsmga001.jf.intel.com with ESMTP; 14 Jun 2016 07:49:17 -0700 Date: Tue, 14 Jun 2016 07:47:45 -0700 From: Jacob Pan To: "Rafael J. Wysocki" Cc: "Rafael J. Wysocki" , LKML , Rafael Wysocki , Linux PM , Srinivas Pandruvada , Prarit Bhargava , jacob.jun.pan@linux.intel.com Subject: Re: [PATCH 1/2] powercap/rapl: add support for skx Message-ID: <20160614074745.315512c1@icelake> In-Reply-To: References: <1464021943-14915-1-git-send-email-jacob.jun.pan@linux.intel.com> <1464021943-14915-2-git-send-email-jacob.jun.pan@linux.intel.com> <2701882.MhyhBLMFz2@vostro.rjw.lan> <1853463.fUpAPaBi47@vostro.rjw.lan> <20160613170622.02f0f80d@yairi> Organization: OTC X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 14 Jun 2016 02:21:41 +0200 "Rafael J. Wysocki" wrote: > On Tue, Jun 14, 2016 at 2:06 AM, Jacob Pan > wrote: > > On Mon, 13 Jun 2016 23:56:18 +0200 > > "Rafael J. Wysocki" wrote: > > > >> On Monday, June 13, 2016 11:32:10 PM Rafael J. Wysocki wrote: > >> > On Monday, May 23, 2016 09:45:42 AM Jacob Pan wrote: > >> > > SKX RAPL interface is similar to HSX/BDX. > >> > > > >> > > Signed-off-by: Jacob Pan > >> > > --- > >> > > drivers/powercap/intel_rapl.c | 1 + > >> > > 1 file changed, 1 insertion(+) > >> > > > >> > > diff --git a/drivers/powercap/intel_rapl.c > >> > > b/drivers/powercap/intel_rapl.c index 470bb62..a417e68 100644 > >> > > --- a/drivers/powercap/intel_rapl.c > >> > > +++ b/drivers/powercap/intel_rapl.c > >> > > @@ -1096,6 +1096,7 @@ static const struct x86_cpu_id rapl_ids[] > >> > > __initconst = { RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake > >> > > */ RAPL_CPU(0x4C, rapl_defaults_cht),/* Braswell/Cherryview > >> > > */ RAPL_CPU(0x4A, rapl_defaults_tng),/* Tangier */ > >> > > + RAPL_CPU(0x55, rapl_defaults_hsw_server),/* Skylake > >> > > server */ RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */ > >> > > RAPL_CPU(0x5A, rapl_defaults_ann),/* Annidale */ > >> > > RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */ > >> > > > >> > > >> > Can you please rebase this on top of 4.7-rc3? > >> > >> Or rather on top of the x86/cpu branch from tip? > >> > > done. just sent you v2. > > [PATCH v2] powercap/rapl: add support for denverton > > Thanks for that one, but the $subject one was for SKX. Any chance to > rebase and resend this one too? SKX has already been added by commit below in tip/x86/cpu: commit d40671e30cb46e834651e0ce3d4590c915171414 Author: Dave Hansen Date: Thu Jun 2 17:19:55 2016 -0700 x86, powercap, rapl: Add Skylake Server model number SKX uses similar RAPL interface as Broadwell server according to Jacob Pan. Signed-off-by: Dave Hansen Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Jacob Pan Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Thomas Gleixner Cc: jacob.jun.pan@intel.com Cc: linux-pm@vger.kernel.org Link: http://lkml.kernel.org/r/20160603001955.38E1E684@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index f4f8532..2e8f2be 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -1114,6 +1114,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { RAPL_CPU(INTEL_FAM6_SKYLAKE_DESKTOP, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_SKYLAKE_MOBILE, rapl_defaults_core), + RAPL_CPU(INTEL_FAM6_SKYLAKE_X, rapl_defaults_hsw_server), RAPL_CPU(INTEL_FAM6_KABYLAKE_MOBILE, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_KABYLAKE_DESKTOP, rapl_defaults_core),