From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424314AbcFHOP0 (ORCPT ); Wed, 8 Jun 2016 10:15:26 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33606 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422913AbcFHOPX (ORCPT ); Wed, 8 Jun 2016 10:15:23 -0400 Date: Wed, 8 Jun 2016 07:14:15 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: dvlasenk@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de, peterz@infradead.org, dave.hansen@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jacob.jun.pan@linux.intel.com, luto@amacapital.net, rjw@rjwysocki.net, brgerst@gmail.com, dave@sr71.net, bp@alien8.de Reply-To: dvlasenk@redhat.com, torvalds@linux-foundation.org, dave.hansen@linux.intel.com, peterz@infradead.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, jacob.jun.pan@linux.intel.com, rjw@rjwysocki.net, luto@amacapital.net, dave@sr71.net, brgerst@gmail.com, bp@alien8.de In-Reply-To: <20160603001955.38E1E684@viggo.jf.intel.com> References: <20160603001955.38E1E684@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpu] x86, powercap, rapl: Add Skylake Server model number Git-Commit-ID: d40671e30cb46e834651e0ce3d4590c915171414 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: d40671e30cb46e834651e0ce3d4590c915171414 Gitweb: http://git.kernel.org/tip/d40671e30cb46e834651e0ce3d4590c915171414 Author: Dave Hansen AuthorDate: Thu, 2 Jun 2016 17:19:55 -0700 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 13:03:25 +0200 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 --- 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 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),