[tip:,x86/splitlock] x86/split_lock: Add Icelake microserver CPU model
diff mbox series

Message ID 158948132586.17726.4500141435426378376.tip-bot2@tip-bot2
State In Next
Commit fadd8de58d01961260cced00fc4c2e7613a53e2e
Headers show
Series
  • [tip:,x86/splitlock] x86/split_lock: Add Icelake microserver CPU model
Related show

Commit Message

tip-bot2 for Jan Kiszka May 14, 2020, 6:35 p.m. UTC
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 <fenghua.yu@intel.com>
AuthorDate:    Thu, 30 Apr 2020 16:46:35 -07:00
Committer:     Borislav Petkov <bp@suse.de>
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.

Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/1588290395-2677-1-git-send-email-fenghua.yu@intel.com
---
 arch/x86/kernel/cpu/intel.c | 1 +
 1 file changed, 1 insertion(+)

Patch
diff mbox series

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index a19a680..b59bc4a 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -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),