From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752546AbcFBAMy (ORCPT ); Wed, 1 Jun 2016 20:12:54 -0400 Received: from mga09.intel.com ([134.134.136.24]:27122 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752183AbcFBAMZ (ORCPT ); Wed, 1 Jun 2016 20:12:25 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,403,1459839600"; d="scan'208";a="114467460" Subject: [PATCH 19/20] x86, rapl: add Skylake server model detection To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Dave Hansen , jacob.jun.pan@linux.intel.com, dave.hansen@linux.intel.com, tglx@linutronix.de From: Dave Hansen Date: Wed, 01 Jun 2016 17:12:24 -0700 References: <20160602001157.D8BE59D7@viggo.jf.intel.com> In-Reply-To: <20160602001157.D8BE59D7@viggo.jf.intel.com> Message-Id: <20160602001224.995E80EA@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jacob Pan SKX uses similar RAPL interface as Broadwell server. Signed-off-by: Jacob Pan Signed-off-by: Dave Hansen Cc: Thomas Gleixner --- b/arch/x86/events/intel/rapl.c | 1 + 1 file changed, 1 insertion(+) diff -puN arch/x86/events/intel/rapl.c~x86-intel-familites-rapl-skx arch/x86/events/intel/rapl.c --- a/arch/x86/events/intel/rapl.c~x86-intel-familites-rapl-skx 2016-06-01 15:45:10.645238850 -0700 +++ b/arch/x86/events/intel/rapl.c 2016-06-01 15:45:10.650239079 -0700 @@ -807,6 +807,7 @@ static const struct x86_cpu_id rapl_cpu_ X86_RAPL_MODEL_MATCH(INTEL_FAM6_MODEL_SKYLAKE_MOBILE, skl_rapl_init), X86_RAPL_MODEL_MATCH(INTEL_FAM6_MODEL_SKYLAKE_DESKTOP, skl_rapl_init), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_MODEL_SKYLAKE_X, hsx_rapl_init), {}, }; _