diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
index a931350a3..e7cb57b46 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
index 97e762399..df2fafff7 100644
--- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
+++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM>
         <IVSHMEM_REGION>
           <NAME>shm_region_0</NAME>
diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
index db626afd2..fcdbca4fe 100644
--- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml
+++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
index 27cde6a8f..b71e48186 100644
--- a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
index 454c6b912..3d06128ee 100644
--- a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml
index 47e2aa86b..70afb811a 100644
--- a/misc/config_tools/data/generic_board/hybrid_rt.xml
+++ b/misc/config_tools/data/generic_board/hybrid_rt.xml
@@ -11,7 +11,7 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
         <CDP_ENABLED>n</CDP_ENABLED>
@@ -20,7 +20,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM>
         <IVSHMEM_REGION>
           <NAME>shm_region_0</NAME>
diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml
index 1d155eac3..2dbe3080f 100644
--- a/misc/config_tools/data/generic_board/partitioned.xml
+++ b/misc/config_tools/data/generic_board/partitioned.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/generic_board/shared_launch_2user_vm.xml b/misc/config_tools/data/generic_board/shared_launch_2user_vm.xml
index 4f5b3fef6..bf57ef7d2 100644
--- a/misc/config_tools/data/generic_board/shared_launch_2user_vm.xml
+++ b/misc/config_tools/data/generic_board/shared_launch_2user_vm.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
index 454c6b912..3d06128ee 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
index c94b8ac3c..3d763c046 100644
--- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml
+++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
index 27c6b9e38..39b78f75d 100644
--- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml
index 265305792..9ae0ea9dd 100644
--- a/misc/config_tools/data/qemu/shared.xml
+++ b/misc/config_tools/data/qemu/shared.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
index 55e48340f..51b29d1bb 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
@@ -6,8 +6,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -18,7 +18,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <KEEP_IRQ_DISABLED>n</KEEP_IRQ_DISABLED>
     </FEATURES>
     <vuart_connections>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
index 53908fc69..1177b0a3d 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
index 87e482c2f..5ac7fa066 100644
--- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
+++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 2bac6ca89..d98e1a481 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
index 76347192b..1b8f009db 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM>
         <IVSHMEM_REGION>
           <NAME>shm_region_0</NAME>
diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
index 5241e2a43..d73248b08 100644
--- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml
+++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
index 0601f10d9..98ebc1978 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
index 6f0693f77..9d05124c4 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
index 95bdcaa4d..63e92335f 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
index 4bd7de3c5..28593335e 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
index d0d614c07..995eefcbc 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
@@ -11,8 +11,8 @@
       <RELOC_ENABLED>y</RELOC_ENABLED>
       <SCHEDULER>SCHED_BVT</SCHEDULER>
       <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
-      <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
-      <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
+      <SPLIT_LOCK_DETECTION_ENABLED>n</SPLIT_LOCK_DETECTION_ENABLED>
+      <UC_LOCK_DETECTION_ENABLED>y</UC_LOCK_DETECTION_ENABLED>
       <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
       <RDT>
         <RDT_ENABLED>n</RDT_ENABLED>
@@ -23,7 +23,7 @@
       <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
       <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
       <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
-      <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
+      <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED>
       <IVSHMEM/>
     </FEATURES>
     <MEMORY>