From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752621AbcFBAQN (ORCPT ); Wed, 1 Jun 2016 20:16:13 -0400 Received: from mga02.intel.com ([134.134.136.20]:63616 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751733AbcFBAMG (ORCPT ); Wed, 1 Jun 2016 20:12:06 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,403,1459839600"; d="scan'208";a="979083547" Subject: [PATCH 06/20] x86, msr: add missing Intel models To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Dave Hansen , dave.hansen@linux.intel.com, peterz@infradead.org, tglx@linutronix.de From: Dave Hansen Date: Wed, 01 Jun 2016 17:12:05 -0700 References: <20160602001157.D8BE59D7@viggo.jf.intel.com> In-Reply-To: <20160602001157.D8BE59D7@viggo.jf.intel.com> Message-Id: <20160602001205.B061850A@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen This patch presumes that Kabylake and Skylake Server will be the same as the existing Skylake parts and adds them to the MSR events code. Also add handling for "WESTMERE2". Signed-off-by: Dave Hansen Cc: Peter Zijlstra Cc: Thomas Gleixner --- b/arch/x86/events/msr.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN arch/x86/events/msr.c~x86-intel-familites-msr-fix arch/x86/events/msr.c --- a/arch/x86/events/msr.c~x86-intel-familites-msr-fix 2016-06-01 15:45:05.061984244 -0700 +++ b/arch/x86/events/msr.c 2016-06-01 15:45:05.064984381 -0700 @@ -40,6 +40,7 @@ static bool test_intel(int idx) case INTEL_FAM6_MODEL_NEHALEM_EX: case INTEL_FAM6_MODEL_WESTMERE: + case INTEL_FAM6_MODEL_WESTMERE2: case INTEL_FAM6_MODEL_WESTMERE_EP: case INTEL_FAM6_MODEL_WESTMERE_EX: @@ -68,6 +69,9 @@ static bool test_intel(int idx) case INTEL_FAM6_MODEL_SKYLAKE_MOBILE: case INTEL_FAM6_MODEL_SKYLAKE_DESKTOP: + case INTEL_FAM6_MODEL_SKYLAKE_X: + case INTEL_FAM6_MODEL_KABYLAKE_MOBILE: + case INTEL_FAM6_MODEL_KABYLAKE_DESKTOP: if (idx == PERF_MSR_SMI || idx == PERF_MSR_PPERF) return true; break; _