x86/split_lock: Add support for Zhaoxin

leoliu-oc · opsiff · commit 40f39f06bbc6 · 2025-10-09T17:56:36.000+08:00
zhaoxin inclusion
category: feature

--------------------

Add Split Lock Detect support for Zhaoxin platforms.

Signed-off-by: LeoLiu-oc &lt;leoliu-oc@zhaoxin.com&gt;
diff --git a/Documentation/arch/x86/buslock.rst b/Documentation/arch/x86/buslock.rst
@@ -27,7 +27,8 @@ Detection
 
 Intel processors may support either or both of the following hardware
 mechanisms to detect split locks and bus locks. Some AMD processors also
-support bus lock detect.
+support bus lock detect. Some Zhaoxin processors also support split lock
+detect.
 
 #AC exception for split lock detection
 --------------------------------------
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
@@ -2488,7 +2488,7 @@ source "kernel/livepatch/Kconfig"
 
 config X86_BUS_LOCK_DETECT
 	bool "Split Lock Detect and Bus Lock Detect support"
-	depends on CPU_SUP_INTEL || CPU_SUP_AMD
+	depends on CPU_SUP_INTEL || CPU_SUP_AMD || CPU_SUP_ZHAOXIN || CPU_SUP_CENTAUR
 	default y
 	help
 	  Enable Split Lock Detect and Bus Lock Detect functionalities.
diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
@@ -224,6 +224,8 @@ static void init_centaur(struct cpuinfo_x86 *c)
 #endif
 
 	init_ia32_feat_ctl(c);
+
+	split_lock_init();
 }
 
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/cpu/zhaoxin.c b/arch/x86/kernel/cpu/zhaoxin.c
@@ -101,6 +101,8 @@ static void init_zhaoxin(struct cpuinfo_x86 *c)
 #endif
 
 	init_ia32_feat_ctl(c);
+
+	split_lock_init();
 }
 
 #ifdef CONFIG_X86_32

Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,8 @@ static void init_centaur(struct cpuinfo_x86 *c)`
`224`	`224`	`#endif`
`225`	`225`
`226`	`226`	`init_ia32_feat_ctl(c);`
	`227`	`+`
	`228`	`+ split_lock_init();`
`227`	`229`	`}`
`228`	`230`
`229`	`231`	`#ifdef CONFIG_X86_32`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,8 @@ static void init_zhaoxin(struct cpuinfo_x86 *c)`
`101`	`101`	`#endif`
`102`	`102`
`103`	`103`	`init_ia32_feat_ctl(c);`
	`104`	`+`
	`105`	`+ split_lock_init();`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`#ifdef CONFIG_X86_32`