* [PATCH] x86/cpu: Fix comment for Sapphire Rapids
@ 2021-05-13 16:39 Andi Kleen
2021-05-14 12:35 ` [tip: x86/cpu] x86/cpu: Fix core name " tip-bot2 for Andi Kleen
0 siblings, 1 reply; 2+ messages in thread
From: Andi Kleen @ 2021-05-13 16:39 UTC (permalink / raw)
To: x86; +Cc: linux-kernel, Andi Kleen, peterz
Sapphire Rapids uses Golden Cove, not Willow Cove.
Cc: peterz@infradead.org
Fixes: 53375a5a218e ("x86/cpu: Resort and comment Intel models")
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
arch/x86/include/asm/intel-family.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 955b06d6325a..27158436f322 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -102,7 +102,8 @@
#define INTEL_FAM6_TIGERLAKE_L 0x8C /* Willow Cove */
#define INTEL_FAM6_TIGERLAKE 0x8D /* Willow Cove */
-#define INTEL_FAM6_SAPPHIRERAPIDS_X 0x8F /* Willow Cove */
+
+#define INTEL_FAM6_SAPPHIRERAPIDS_X 0x8F /* Golden Cove */
#define INTEL_FAM6_ALDERLAKE 0x97 /* Golden Cove / Gracemont */
#define INTEL_FAM6_ALDERLAKE_L 0x9A /* Golden Cove / Gracemont */
--
2.25.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* [tip: x86/cpu] x86/cpu: Fix core name for Sapphire Rapids
2021-05-13 16:39 [PATCH] x86/cpu: Fix comment for Sapphire Rapids Andi Kleen
@ 2021-05-14 12:35 ` tip-bot2 for Andi Kleen
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Andi Kleen @ 2021-05-14 12:35 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Andi Kleen, Borislav Petkov, x86, linux-kernel
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 28188cc461f6cf8b7d28de4f6df52014cc1d5e39
Gitweb: https://git.kernel.org/tip/28188cc461f6cf8b7d28de4f6df52014cc1d5e39
Author: Andi Kleen <ak@linux.intel.com>
AuthorDate: Thu, 13 May 2021 09:39:04 -07:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Fri, 14 May 2021 14:31:14 +02:00
x86/cpu: Fix core name for Sapphire Rapids
Sapphire Rapids uses Golden Cove, not Willow Cove.
Fixes: 53375a5a218e ("x86/cpu: Resort and comment Intel models")
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210513163904.3083274-1-ak@linux.intel.com
---
arch/x86/include/asm/intel-family.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 955b06d..2715843 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -102,7 +102,8 @@
#define INTEL_FAM6_TIGERLAKE_L 0x8C /* Willow Cove */
#define INTEL_FAM6_TIGERLAKE 0x8D /* Willow Cove */
-#define INTEL_FAM6_SAPPHIRERAPIDS_X 0x8F /* Willow Cove */
+
+#define INTEL_FAM6_SAPPHIRERAPIDS_X 0x8F /* Golden Cove */
#define INTEL_FAM6_ALDERLAKE 0x97 /* Golden Cove / Gracemont */
#define INTEL_FAM6_ALDERLAKE_L 0x9A /* Golden Cove / Gracemont */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-14 12:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-13 16:39 [PATCH] x86/cpu: Fix comment for Sapphire Rapids Andi Kleen
2021-05-14 12:35 ` [tip: x86/cpu] x86/cpu: Fix core name " tip-bot2 for Andi Kleen
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).