UefiCpuPkg/MpInitLib: Add EnableExecuteDisable in MP_CPU_EXCHANGE_INFO

[mirror_edk2.git] / UefiCpuPkg / Library / MpInitLib / Ia32 / MpFuncs.nasm

diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
index 7050413c5af39680bdb42d0751824b0f6295b6a0..8bacb4283641370eab2be4d83a8e9894fe649cdf 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
+++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm
@@ -85,6 +85,36 @@ Flat32Start:                                   ; protected mode entry point
     mov        ss, dx\r
 \r
     mov        esi, ebx\r
+\r
+    mov         edi, esi\r
+    add         edi, EnableExecuteDisableLocation\r
+    cmp         byte [edi], 0\r
+    jz          SkipEnableExecuteDisable\r
+\r
+    ;\r
+    ; Enable IA32 PAE execute disable\r
+    ;\r
+\r
+    mov         ecx, 0xc0000080\r
+    rdmsr\r
+    bts         eax, 11\r
+    wrmsr\r
+\r
+    mov         edi, esi\r
+    add         edi, Cr3Location\r
+    mov         eax, dword [edi]\r
+    mov         cr3, eax\r
+\r
+    mov         eax, cr4\r
+    bts         eax, 5\r
+    mov         cr4, eax\r
+\r
+    mov         eax, cr0\r
+    bts         eax, 31\r
+    mov         cr0, eax\r
+\r
+SkipEnableExecuteDisable:\r
+\r
     mov        edi, esi\r
     add        edi, LockLocation\r
     mov        eax, NotVacantFlag\r