* [PATCH] x86/cpu: Comment Skylake server stepping too
@ 2021-04-09 12:10 Andrew Cooper
2021-04-10 9:28 ` [tip: x86/core] " tip-bot2 for Andrew Cooper
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Cooper @ 2021-04-09 12:10 UTC (permalink / raw)
To: LKML; +Cc: Andrew Cooper, Peter Zijlstra, Tony Luck, x86
Further to commit 53375a5a218e ("x86/cpu: Resort and comment Intel
models"), CascadeLake and CooperLake are steppings of Skylake, and make up
the 1st to 3rd generation "Xeon Scalable Processor" line.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Peter Zijlstra <peterz@infradead.org>
CC: Tony Luck <tony.luck@intel.com>
CC: x86@kernel.org
CC: linux-kernel@vger.kernel.org
It is left as an exercise to the reader to ponder why the 3rd generation Xeon
Scalable brand is formed of both CooperLake and IceLake parts.
---
arch/x86/include/asm/intel-family.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index b15262f1f645..955b06d6325a 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -33,7 +33,7 @@
* _EX - 4+ socket server parts
*
* The #define line may optionally include a comment including platform or core
- * names. An exception is made for kabylake where steppings seem to have gotten
+ * names. An exception is made for skylake/kabylake where steppings seem to have gotten
* their own names :-(
*/
@@ -74,6 +74,8 @@
#define INTEL_FAM6_SKYLAKE_L 0x4E /* Sky Lake */
#define INTEL_FAM6_SKYLAKE 0x5E /* Sky Lake */
#define INTEL_FAM6_SKYLAKE_X 0x55 /* Sky Lake */
+/* CASCADELAKE_X 0x55 Sky Lake -- s: 7 */
+/* COOPERLAKE_X 0x55 Sky Lake -- s: 11 */
#define INTEL_FAM6_KABYLAKE_L 0x8E /* Sky Lake */
/* AMBERLAKE_L 0x8E Sky Lake -- s: 9 */
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/core] x86/cpu: Comment Skylake server stepping too
2021-04-09 12:10 [PATCH] x86/cpu: Comment Skylake server stepping too Andrew Cooper
@ 2021-04-10 9:28 ` tip-bot2 for Andrew Cooper
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Andrew Cooper @ 2021-04-10 9:28 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Andrew Cooper, Borislav Petkov, x86, linux-kernel
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 99cb64de36d5c9397a664808b92943e35bdce25e
Gitweb: https://git.kernel.org/tip/99cb64de36d5c9397a664808b92943e35bdce25e
Author: Andrew Cooper <andrew.cooper3@citrix.com>
AuthorDate: Fri, 09 Apr 2021 13:10:27 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Sat, 10 Apr 2021 11:14:33 +02:00
x86/cpu: Comment Skylake server stepping too
Further to
53375a5a218e ("x86/cpu: Resort and comment Intel models"),
CascadeLake and CooperLake are steppings of Skylake, and make up the 1st
to 3rd generation "Xeon Scalable Processor" line.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210409121027.16437-1-andrew.cooper3@citrix.com
---
arch/x86/include/asm/intel-family.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index b15262f..955b06d 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -33,7 +33,7 @@
* _EX - 4+ socket server parts
*
* The #define line may optionally include a comment including platform or core
- * names. An exception is made for kabylake where steppings seem to have gotten
+ * names. An exception is made for skylake/kabylake where steppings seem to have gotten
* their own names :-(
*/
@@ -74,6 +74,8 @@
#define INTEL_FAM6_SKYLAKE_L 0x4E /* Sky Lake */
#define INTEL_FAM6_SKYLAKE 0x5E /* Sky Lake */
#define INTEL_FAM6_SKYLAKE_X 0x55 /* Sky Lake */
+/* CASCADELAKE_X 0x55 Sky Lake -- s: 7 */
+/* COOPERLAKE_X 0x55 Sky Lake -- s: 11 */
#define INTEL_FAM6_KABYLAKE_L 0x8E /* Sky Lake */
/* AMBERLAKE_L 0x8E Sky Lake -- s: 9 */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-10 9:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-09 12:10 [PATCH] x86/cpu: Comment Skylake server stepping too Andrew Cooper
2021-04-10 9:28 ` [tip: x86/core] " tip-bot2 for Andrew Cooper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).