From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752246AbcGAIRZ (ORCPT ); Fri, 1 Jul 2016 04:17:25 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33244 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752542AbcGAIK3 (ORCPT ); Fri, 1 Jul 2016 04:10:29 -0400 Date: Fri, 1 Jul 2016 01:09:54 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, dave@sr71.net, dave.hansen@linux.intel.com, tglx@linutronix.de, mingo@kernel.org, lenb@kernel.org, peterz@infradead.org, torvalds@linux-foundation.org Reply-To: peterz@infradead.org, torvalds@linux-foundation.org, lenb@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, dave.hansen@linux.intel.com, dave@sr71.net In-Reply-To: <20160629192737.949C41A8@viggo.jf.intel.com> References: <20160629192737.949C41A8@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpu] x86/cpu: Rename "WESTMERE2" family to "NEHALEM_G" Git-Commit-ID: 4b3b234f434d440fcd749b9636131b76e2ce561e 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: 4b3b234f434d440fcd749b9636131b76e2ce561e Gitweb: http://git.kernel.org/tip/4b3b234f434d440fcd749b9636131b76e2ce561e Author: Dave Hansen AuthorDate: Wed, 29 Jun 2016 12:27:37 -0700 Committer: Ingo Molnar CommitDate: Fri, 1 Jul 2016 10:03:24 +0200 x86/cpu: Rename "WESTMERE2" family to "NEHALEM_G" Len Brown noticed something was amiss in our INTEL_FAM6_* definitions. It seems like model 0x1F was a Nehalem part, marketed as "Intel Core i7 and i5 Processors" (according to the SDM). But, although it was a Nehalem 0x1F had some uncore events which were shared with Westmere. Len also mentioned he thought it was called "Havendale", which Wikipedia says was graphics-oriented and canceled: https://en.wikipedia.org/wiki/Nehalem_(microarchitecture) So either way, it's probably not imporant what we call it, but call it Nehalem to be accurate, and add a "G" since it seems graphics-related. If it were canceled that would be a good reason why it's so sparsely and inconsistently referred to in the code. Signed-off-by: Dave Hansen Cc: Dave Hansen Cc: Len Brown Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20160629192737.949C41A8@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/intel-family.h | 2 +- drivers/idle/intel_idle.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 6999f7d..2a01701 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -18,10 +18,10 @@ #define INTEL_FAM6_CORE2_DUNNINGTON 0x1D #define INTEL_FAM6_NEHALEM 0x1E +#define INTEL_FAM6_NEHALEM_G 0x1F /* Auburndale / Havendale */ #define INTEL_FAM6_NEHALEM_EP 0x1A #define INTEL_FAM6_NEHALEM_EX 0x2E #define INTEL_FAM6_WESTMERE 0x25 -#define INTEL_FAM6_WESTMERE2 0x1F #define INTEL_FAM6_WESTMERE_EP 0x2C #define INTEL_FAM6_WESTMERE_EX 0x2F diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index b5dd41d..d103adc 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -1023,7 +1023,7 @@ static const struct idle_cpu idle_cpu_bxt = { static const struct x86_cpu_id intel_idle_ids[] __initconst = { ICPU(INTEL_FAM6_NEHALEM_EP, idle_cpu_nehalem), ICPU(INTEL_FAM6_NEHALEM, idle_cpu_nehalem), - ICPU(INTEL_FAM6_WESTMERE2, idle_cpu_nehalem), + ICPU(INTEL_FAM6_NEHALEM_G, idle_cpu_nehalem), ICPU(INTEL_FAM6_WESTMERE, idle_cpu_nehalem), ICPU(INTEL_FAM6_WESTMERE_EP, idle_cpu_nehalem), ICPU(INTEL_FAM6_NEHALEM_EX, idle_cpu_nehalem),