From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752003AbcF2T1n (ORCPT ); Wed, 29 Jun 2016 15:27:43 -0400 Received: from mga09.intel.com ([134.134.136.24]:11093 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751587AbcF2T1l (ORCPT ); Wed, 29 Jun 2016 15:27:41 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,548,1459839600"; d="scan'208";a="1012254931" Subject: [PATCH] x86: rename "WESTMERE2" family to "NEHALEM_G" To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Dave Hansen , lenb@kernel.org, dave.hansen@linux.intel.com From: Dave Hansen Date: Wed, 29 Jun 2016 12:27:37 -0700 Message-Id: <20160629192737.949C41A8@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen 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. Cc: Len Brown Signed-off-by: Dave Hansen --- b/arch/x86/events/msr.c | 2 +- b/arch/x86/include/asm/intel-family.h | 2 +- b/drivers/idle/intel_idle.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/x86/include/asm/intel-family.h~rename-westmere arch/x86/include/asm/intel-family.h --- a/arch/x86/include/asm/intel-family.h~rename-westmere 2016-06-29 12:25:30.919935676 -0700 +++ b/arch/x86/include/asm/intel-family.h 2016-06-29 12:25:30.925935948 -0700 @@ -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 -puN arch/x86/events/msr.c~rename-westmere arch/x86/events/msr.c --- a/arch/x86/events/msr.c~rename-westmere 2016-06-29 12:25:30.920935721 -0700 +++ b/arch/x86/events/msr.c 2016-06-29 12:25:30.926935993 -0700 @@ -36,11 +36,11 @@ static bool test_intel(int idx) switch (boot_cpu_data.x86_model) { case INTEL_FAM6_NEHALEM: + case INTEL_FAM6_NEHALEM_G: case INTEL_FAM6_NEHALEM_EP: case INTEL_FAM6_NEHALEM_EX: case INTEL_FAM6_WESTMERE: - case INTEL_FAM6_WESTMERE2: case INTEL_FAM6_WESTMERE_EP: case INTEL_FAM6_WESTMERE_EX: diff -puN drivers/idle/intel_idle.c~rename-westmere drivers/idle/intel_idle.c --- a/drivers/idle/intel_idle.c~rename-westmere 2016-06-29 12:25:30.922935812 -0700 +++ b/drivers/idle/intel_idle.c 2016-06-29 12:25:30.927936038 -0700 @@ -1023,7 +1023,7 @@ static const struct idle_cpu idle_cpu_bx 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), _