From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161554AbcFCAUa (ORCPT ); Thu, 2 Jun 2016 20:20:30 -0400 Received: from mga01.intel.com ([192.55.52.88]:33266 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161428AbcFCATy (ORCPT ); Thu, 2 Jun 2016 20:19:54 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,409,1459839600"; d="scan'208";a="820618153" Subject: [PATCH 19/20] x86, rapl: add Skylake server model detection To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, jacob.jun.pan@intel.com, Dave Hansen , jacob.jun.pan@linux.intel.com, dave.hansen@linux.intel.com, tglx@linutronix.de From: Dave Hansen Date: Thu, 02 Jun 2016 17:19:53 -0700 References: <20160603001927.F2A7D828@viggo.jf.intel.com> In-Reply-To: <20160603001927.F2A7D828@viggo.jf.intel.com> Message-Id: <20160603001953.38848836@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-02 15:19:23.679462110 -0700 +++ b/arch/x86/events/intel/rapl.c 2016-06-02 15:19:23.688462520 -0700 @@ -807,6 +807,7 @@ static const struct x86_cpu_id rapl_cpu_ X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE, skl_rapl_init), X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP, skl_rapl_init), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X, hsx_rapl_init), {}, }; _