Skip to contentSkip to conversation

x86/split_lock: Add Icelake microserver CPU model

PATCH Applied Fenghua Yu 2 participants 4 messages Apr 30, 2020 – May 28, 2020 x86

lore
Share & tools
lore

Fenghua Yu

author
#0 lore raw

PATCH 1/1 x86/split_lock: Add Icelake microserver CPU model

Icelake microserver CPU supports split lock detection while it doesn't have the split lock enumeration bit in IA32_CORE_CAPABILITIES.

Enumerate the feature by model number.

---
 arch/x86/kernel/cpu/intel.c | 1 +
 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/intel.c +1 -0
index a19a680542ce..b59bc4ab2425 100644
@@ -1135,6 +1135,7 @@ void switch_to_sld(unsigned long tifn)
 static const struct x86_cpu_id split_lock_cpu_ids[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		0),
 	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		0),
+	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		0),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	1),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,	1),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,	1),
Signature · 1 line
2.19.1
author
#1 lore raw
Quoted 16 lines · Fenghua Yu

Icelake microserver CPU supports split lock detection while it doesn't have the split lock enumeration bit in IA32_CORE_CAPABILITIES.

Enumerate the feature by model number.

---
 arch/x86/kernel/cpu/intel.c | 1 +
 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/intel.c +0 -0
index a19a680542ce..b59bc4ab2425 100644

arch/x86/kernel/cpu/intel.c void switch_to_sld(unsigned long tifn) · line 1141

Quoted 7 lines
arch/x86/kernel/cpu/intel.c +1 -0
@@ -1135,6 +1135,7 @@ void switch_to_sld(unsigned long tifn)
 static const struct x86_cpu_id split_lock_cpu_ids[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		0),
 	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		0),
+	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		0),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	1),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,	1),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,	1),

Hi, Thomas,

Any comment on this patch? Will you accept this patch?

Thanks.

-Fenghua

merge bot Applied
#2 lore raw
In reply to Fenghua Yu
The following commit has been merged into the x86/splitlock branch of tip:

The following commit has been merged into the x86/splitlock branch of tip:

Commit-ID:     0ed7bf1d92eafc37bb9eb7c8692a8e44d24f9b99
Gitweb:        https://git.kernel.org/tip/0ed7bf1d92eafc37bb9eb7c8692a8e44d24f9b99
Author:        Fenghua Yu <[email protected]>
AuthorDate:    Thu, 30 Apr 2020 16:46:35 -07:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Thu, 14 May 2020 19:25:10 +02:00

x86/split_lock: Add Icelake microserver CPU model

Icelake microserver CPU supports split lock detection while it doesn't have the split lock enumeration bit in IA32_CORE_CAPABILITIES.

Enumerate the feature by model number.

---
 arch/x86/kernel/cpu/intel.c | 1 +
 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/intel.c +1 -0
index a19a680..b59bc4a 100644
@@ -1135,6 +1135,7 @@ void switch_to_sld(unsigned long tifn)
 static const struct x86_cpu_id split_lock_cpu_ids[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		0),
 	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		0),
+	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		0),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	1),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,	1),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,	1),
merge bot Applied
#3 lore raw

[tip: x86/splitlock] x86/split_lock: Add Icelake microserver and Tigerlake CPU models

In reply to Fenghua Yu
The following commit has been merged into the x86/splitlock branch of tip:

The following commit has been merged into the x86/splitlock branch of tip:

Commit-ID:     429ac8b75a0b1c3478ffd584de8a63075cbe25e7
Gitweb:        https://git.kernel.org/tip/429ac8b75a0b1c3478ffd584de8a63075cbe25e7
Author:        Fenghua Yu <[email protected]>
AuthorDate:    Thu, 30 Apr 2020 16:46:35 -07:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Thu, 28 May 2020 21:06:42 +02:00

x86/split_lock: Add Icelake microserver and Tigerlake CPU models

Icelake microserver CPU supports split lock detection while it doesn't have the split lock enumeration bit in IA32_CORE_CAPABILITIES. Tigerlake CPUs do enumerate the MSR.

[ bp: Merge the two model-adding patches into one. ]

---
 arch/x86/kernel/cpu/intel.c | 3 +++
 1 file changed, 3 insertions(+)
arch/x86/kernel/cpu/intel.c +3 -0
index a19a680..6abbcc7 100644
@@ -1135,9 +1135,12 @@ void switch_to_sld(unsigned long tifn)
 static const struct x86_cpu_id split_lock_cpu_ids[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		0),
 	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		0),
+	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		0),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	1),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,	1),
 	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,	1),
+	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		1),
+	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		1),
 	{}
 };