* [PATCH] x86: rename "WESTMERE2" family to "NEHALEM_G"
@ 2016-06-29 19:27 Dave Hansen
2016-07-01 8:09 ` [tip:x86/cpu] x86/cpu: Rename " tip-bot for Dave Hansen
0 siblings, 1 reply; 2+ messages in thread
From: Dave Hansen @ 2016-06-29 19:27 UTC (permalink / raw)
To: linux-kernel; +Cc: x86, Dave Hansen, lenb, dave.hansen
From: Dave Hansen <dave.hansen@linux.intel.com>
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 <lenb@kernel.org>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
---
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),
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/cpu] x86/cpu: Rename "WESTMERE2" family to "NEHALEM_G"
2016-06-29 19:27 [PATCH] x86: rename "WESTMERE2" family to "NEHALEM_G" Dave Hansen
@ 2016-07-01 8:09 ` tip-bot for Dave Hansen
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Dave Hansen @ 2016-07-01 8:09 UTC (permalink / raw)
To: linux-tip-commits
Cc: hpa, linux-kernel, dave, dave.hansen, tglx, mingo, lenb, peterz,
torvalds
Commit-ID: 4b3b234f434d440fcd749b9636131b76e2ce561e
Gitweb: http://git.kernel.org/tip/4b3b234f434d440fcd749b9636131b76e2ce561e
Author: Dave Hansen <dave.hansen@linux.intel.com>
AuthorDate: Wed, 29 Jun 2016 12:27:37 -0700
Committer: Ingo Molnar <mingo@kernel.org>
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 <dave.hansen@linux.intel.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160629192737.949C41A8@viggo.jf.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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),
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-01 8:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-29 19:27 [PATCH] x86: rename "WESTMERE2" family to "NEHALEM_G" Dave Hansen
2016-07-01 8:09 ` [tip:x86/cpu] x86/cpu: Rename " tip-bot for Dave Hansen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.