From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752314AbcFBAM2 (ORCPT ); Wed, 1 Jun 2016 20:12:28 -0400 Received: from mga11.intel.com ([192.55.52.93]:50438 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093AbcFBAM0 (ORCPT ); Wed, 1 Jun 2016 20:12:26 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,403,1459839600"; d="scan'208";a="979083659" Subject: [PATCH 20/20] x86, powercap, rapl: add Skylake Server model number To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Dave Hansen , dave.hansen@linux.intel.com, jacob.jun.pan@linux.intel.com, rjw@rjwysocki.net, linux-pm@vger.kernel.org From: Dave Hansen Date: Wed, 01 Jun 2016 17:12:25 -0700 References: <20160602001157.D8BE59D7@viggo.jf.intel.com> In-Reply-To: <20160602001157.D8BE59D7@viggo.jf.intel.com> Message-Id: <20160602001225.6F281D8E@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen SKX uses similar RAPL interface as Broadwell server according to Jacob Pan. Signed-off-by: Dave Hansen Cc: Jacob Pan Cc: "Rafael J. Wysocki" Cc: linux-pm@vger.kernel.org --- b/drivers/powercap/intel_rapl.c | 1 + 1 file changed, 1 insertion(+) diff -puN drivers/powercap/intel_rapl.c~x86-intel-familites-powercap-rapl-add-skx drivers/powercap/intel_rapl.c --- a/drivers/powercap/intel_rapl.c~x86-intel-familites-powercap-rapl-add-skx 2016-06-01 15:45:11.070258232 -0700 +++ b/drivers/powercap/intel_rapl.c 2016-06-01 15:45:11.075258460 -0700 @@ -1114,6 +1114,7 @@ static const struct x86_cpu_id rapl_ids[ RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_DESKTOP, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_MOBILE, rapl_defaults_core), + RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_X, rapl_defaults_hsw_server), RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_MOBILE, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_DESKTOP, rapl_defaults_core), _