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@xxxxxxxxxx> AuthorDate: Fri, 09 Apr 2021 13:10:27 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> 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@xxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lkml.kernel.org/r/20210409121027.16437-1-andrew.cooper3@xxxxxxxxxx --- 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 */
![]() |